From c40957c718b822a34ba69fb6c6f96942644a17f0 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Thu, 19 Apr 2018 18:37:42 -0700
Subject: [PATCH 1/5] Adding CSharp readme for multiApi support

---
 .../resource-manager/readme.csharp.md         | 31 ++++++++++++++++
 .../authorization/resource-manager/readme.md  | 15 --------
 .../compute/resource-manager/readme.csharp.md | 34 ++++++++++++++++++
 .../compute/resource-manager/readme.md        | 18 ----------
 .../resource-manager/readme.csharp.md         | 27 ++++++++++++++
 .../keyvault/resource-manager/readme.md       | 15 --------
 .../network/resource-manager/readme.csharp.md | 35 ++++++++++++++++++
 .../network/resource-manager/readme.md        | 16 ---------
 .../resource-manager/readme.csharp.md         | 36 +++++++++++++++++++
 .../resources/resource-manager/readme.md      | 24 -------------
 .../storage/resource-manager/readme.csharp.md | 31 ++++++++++++++++
 .../storage/resource-manager/readme.md        | 17 ---------
 .../resource-manager/readme.csharp.md         | 31 ++++++++++++++++
 .../subscription/resource-manager/readme.md   | 14 --------
 .../web/resource-manager/readme.csharp.md     | 30 ++++++++++++++++
 specification/web/resource-manager/readme.md  | 14 --------
 16 files changed, 255 insertions(+), 133 deletions(-)
 create mode 100644 specification/authorization/resource-manager/readme.csharp.md
 create mode 100644 specification/compute/resource-manager/readme.csharp.md
 create mode 100644 specification/keyvault/resource-manager/readme.csharp.md
 create mode 100644 specification/network/resource-manager/readme.csharp.md
 create mode 100644 specification/resources/resource-manager/readme.csharp.md
 create mode 100644 specification/storage/resource-manager/readme.csharp.md
 create mode 100644 specification/subscription/resource-manager/readme.csharp.md
 create mode 100644 specification/web/resource-manager/readme.csharp.md

diff --git a/specification/authorization/resource-manager/readme.csharp.md b/specification/authorization/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..adde5ad8c3f7
--- /dev/null
+++ b/specification/authorization/resource-manager/readme.csharp.md
@@ -0,0 +1,31 @@
+# C# Authorization
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+## Common C# Settings
+
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+payload-flattening-threshold: 1
+clear-output-folder: true
+namespace: Microsoft.Azure.Management.Authorization
+output-folder: $(csharp-sdks-folder)/Authorization/Management.Authorization/Generated
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.Authorization.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+  - tag: package-2015-07
+    ApiVersionName: Api2015_07_01
+```
\ No newline at end of file
diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md
index cd73fb474cff..ae30a391f4ae 100644
--- a/specification/authorization/resource-manager/readme.md
+++ b/specification/authorization/resource-manager/readme.md
@@ -86,21 +86,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.Authorization
-  output-folder: $(csharp-sdks-folder)/Authorization/Management.Authorization/Generated
-  clear-output-folder: true
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
diff --git a/specification/compute/resource-manager/readme.csharp.md b/specification/compute/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..76bc4bd469da
--- /dev/null
+++ b/specification/compute/resource-manager/readme.csharp.md
@@ -0,0 +1,34 @@
+# C# Compute
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+## Common C# settings
+
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+payload-flattening-threshold: 1
+clear-output-folder: true
+namespace: Microsoft.Azure.Management.Compute.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/Compute/Management.Compute/Generated
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.Compute.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+  - tag: package-2017-03
+    ApiVersionName: Api2017_03_30
+
+  - tag: package-2016-03
+    ApiVersionName: Api2016_03_30
+```
\ No newline at end of file
diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md
index 4fdf4f8f2075..9692318be699 100644
--- a/specification/compute/resource-manager/readme.md
+++ b/specification/compute/resource-manager/readme.md
@@ -338,24 +338,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  # last generated with AutoRest.1.0.0-Nightly20170126
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.Compute
-  payload-flattening-threshold: 1
-  output-folder: $(csharp-sdks-folder)/Compute/Management.Compute/Generated
-  clear-output-folder: true
-```
-
-
 ## Go
 
 These settings apply only when `--go` is specified on the command line.
diff --git a/specification/keyvault/resource-manager/readme.csharp.md b/specification/keyvault/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..135ae2549748
--- /dev/null
+++ b/specification/keyvault/resource-manager/readme.csharp.md
@@ -0,0 +1,27 @@
+# C# KeyVault
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+## Common settings
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+clear-output-folder: true
+payload-flattening-threshold: 2
+namespace: Microsoft.Azure.Management.KeyVault
+output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Generated
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.KeyVault.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+  - tag: package-2016-10
+    ApiVersionName: Api2016_10_01
+```
\ No newline at end of file
diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md
index 1ab2720d52e9..98af0dbc641d 100644
--- a/specification/keyvault/resource-manager/readme.md
+++ b/specification/keyvault/resource-manager/readme.md
@@ -68,21 +68,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.KeyVault
-  output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Generated
-  clear-output-folder: true
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
diff --git a/specification/network/resource-manager/readme.csharp.md b/specification/network/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..21bcc889856b
--- /dev/null
+++ b/specification/network/resource-manager/readme.csharp.md
@@ -0,0 +1,35 @@
+# C# Network
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+## Common Settings
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+## Common Settings
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+payload-flattening-threshold: 1
+clear-output-folder: true
+namespace: Microsoft.Azure.Management.Network
+output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
+```
+
+## MultiApi settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.Network.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+  - tag: package-2017-10
+    ApiVersionName: Api2017_10_01
+
+  - tag: package-2015-06split
+    ApiVersionName: Api2016_06_15
+```
\ No newline at end of file
diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md
index 0975e00a24fc..535aeb9ed02a 100644
--- a/specification/network/resource-manager/readme.md
+++ b/specification/network/resource-manager/readme.md
@@ -366,22 +366,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.Network
-  output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
-  clear-output-folder: true
-```
-
-
 ## Go
 
 These settings apply only when `--go` is specified on the command line.
diff --git a/specification/resources/resource-manager/readme.csharp.md b/specification/resources/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..cd5863361456
--- /dev/null
+++ b/specification/resources/resource-manager/readme.csharp.md
@@ -0,0 +1,36 @@
+# C# ResourceManager
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+## Common C# Settings
+
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+clear-output-folder: true
+namespace: Microsoft.Azure.Management.ResourceManager  
+output-folder: $(csharp-sdks-folder)/Resource/Management.ResourceManager/Generated
+
+batch:
+  - package-features: true
+  - package-locks: true
+  - package-policy: true
+  - package-resources: true
+  - package-subscriptions: true
+  - package-links: true
+#  - package-managedapplications: true
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.ResourceManager.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+   - tag: package-resources-2016-02
+     ApiVersionName: Api2016_02_01
+```
\ No newline at end of file
diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md
index e9ba21c02e03..f11e067b0dea 100644
--- a/specification/resources/resource-manager/readme.md
+++ b/specification/resources/resource-manager/readme.md
@@ -272,30 +272,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-```yaml $(csharp)
-csharp:
-  azure-arm: true
-  namespace: Microsoft.Azure.Management.ResourceManager
-  license-header: MICROSOFT_MIT_NO_VERSION
-  output-folder: $(csharp-sdks-folder)/Resource/Management.ResourceManager/Generated
-batch:
-  - package-features: true
-    clear-output-folder: true # clear output folder on first run
-  - package-locks: true
-  - package-policy: true
-  - package-resources: true
-  - package-subscriptions: true
-  - package-links: true
-#  - package-managedapplications: true
-```
-
-
 ## Go
 
 These settings apply only when `--go` is specified on the command line.
diff --git a/specification/storage/resource-manager/readme.csharp.md b/specification/storage/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..12ab842f4d31
--- /dev/null
+++ b/specification/storage/resource-manager/readme.csharp.md
@@ -0,0 +1,31 @@
+# C# Storage
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+## Common C# Settings
+
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+clear-output-folder: true
+payload-flattening-threshold: 2
+output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
+namespace: Microsoft.Azure.Management.Storage  
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.Storage.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+  - tag: package-2016-01
+    ApiVersionName: Api2016_01_01
+
+  - tag: package-2015-06
+    ApiVersionName: Api2015_06_05
+```
\ No newline at end of file
diff --git a/specification/storage/resource-manager/readme.md b/specification/storage/resource-manager/readme.md
index 7b42db1de0c9..62e88ba24423 100644
--- a/specification/storage/resource-manager/readme.md
+++ b/specification/storage/resource-manager/readme.md
@@ -115,23 +115,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
 ```
 
-
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.Storage
-  payload-flattening-threshold: 2
-  output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
-  clear-output-folder: true
-```
-
-
 ## Go
 
 These settings apply only when `--go` is specified on the command line.
diff --git a/specification/subscription/resource-manager/readme.csharp.md b/specification/subscription/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..229a88206665
--- /dev/null
+++ b/specification/subscription/resource-manager/readme.csharp.md
@@ -0,0 +1,31 @@
+# C# Subscription
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+## Common C# Settings
+
+``` yaml !$(MultiApi)
+azure-arm: true
+namespace: Microsoft.Azure.Management.Subscription
+license-header: MICROSOFT_MIT_NO_VERSION
+output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Generated
+clear-output-folder: true
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.Subscription.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+   - tag: package-2018-03-preview
+     ApiVersionName: Api2018_03_01
+```
\ No newline at end of file
diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md
index 01234c5e2eae..8d96e8d33ac9 100644
--- a/specification/subscription/resource-manager/readme.md
+++ b/specification/subscription/resource-manager/readme.md
@@ -72,20 +72,6 @@ swagger-to-sdk:
 ```
 
 
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-```yaml $(csharp)
-csharp:
-  azure-arm: true
-  namespace: Microsoft.Azure.Management.Subscription
-  license-header: MICROSOFT_MIT_NO_VERSION
-  output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Generated
-  clear-output-folder: true
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
diff --git a/specification/web/resource-manager/readme.csharp.md b/specification/web/resource-manager/readme.csharp.md
new file mode 100644
index 000000000000..fed8de768305
--- /dev/null
+++ b/specification/web/resource-manager/readme.csharp.md
@@ -0,0 +1,30 @@
+# C# Web
+
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for DNS.
+
+## Common settings
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+``` yaml !$(MultiApi)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+namespace: Microsoft.Azure.Management.WebSites
+output-folder: $(csharp-sdks-folder)/WebSites/Management.WebSites/Generated
+clear-output-folder: true
+```
+
+## Batch settings
+These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
+
+``` yaml $(MultiApi)
+namespace: Microsoft.Azure.Management.WebSites.$(ApiVersionName)
+output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
+
+batch:
+#For WebSite 2016-08-01, you use the below tag
+  - tag: package-2016-09
+    ApiVersionName: Api2016_08_01
+```
\ No newline at end of file
diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md
index 398396b1f542..c917fb8b75cf 100644
--- a/specification/web/resource-manager/readme.md
+++ b/specification/web/resource-manager/readme.md
@@ -201,20 +201,6 @@ swagger-to-sdk:
 ```
 
 
-## C#
-
-These settings apply only when `--csharp` is specified on the command line.
-Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
-
-``` yaml $(csharp)
-csharp:
-  # last generated with commit e416af734666d658a04530df605f60480c01cc10
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: Microsoft.Azure.Management.WebSites
-  output-folder: $(csharp-sdks-folder)/WebSites/Management.WebSites/Generated
-  clear-output-folder: true
-```
 
 ## Python
 

From 97c914d66e48c2e075e1bf9969ccfeee3f85dfff Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Thu, 26 Apr 2018 12:49:21 -0700
Subject: [PATCH 2/5] updating the config to retain previously set defaults

---
 specification/authorization/resource-manager/readme.csharp.md | 1 -
 specification/compute/resource-manager/readme.csharp.md       | 2 +-
 specification/keyvault/resource-manager/readme.csharp.md      | 1 -
 specification/network/resource-manager/readme.csharp.md       | 1 -
 specification/storage/resource-manager/readme.csharp.md       | 2 +-
 specification/subscription/resource-manager/readme.csharp.md  | 4 ++--
 specification/web/resource-manager/readme.csharp.md           | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/specification/authorization/resource-manager/readme.csharp.md b/specification/authorization/resource-manager/readme.csharp.md
index adde5ad8c3f7..d51d36a66dd7 100644
--- a/specification/authorization/resource-manager/readme.csharp.md
+++ b/specification/authorization/resource-manager/readme.csharp.md
@@ -12,7 +12,6 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 ``` yaml !$(MultiApi)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
-payload-flattening-threshold: 1
 clear-output-folder: true
 namespace: Microsoft.Azure.Management.Authorization
 output-folder: $(csharp-sdks-folder)/Authorization/Management.Authorization/Generated
diff --git a/specification/compute/resource-manager/readme.csharp.md b/specification/compute/resource-manager/readme.csharp.md
index 76bc4bd469da..0983df045da5 100644
--- a/specification/compute/resource-manager/readme.csharp.md
+++ b/specification/compute/resource-manager/readme.csharp.md
@@ -14,7 +14,7 @@ azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 payload-flattening-threshold: 1
 clear-output-folder: true
-namespace: Microsoft.Azure.Management.Compute.$(ApiVersionName)
+namespace: Microsoft.Azure.Management.Compute
 output-folder: $(csharp-sdks-folder)/Compute/Management.Compute/Generated
 ```
 
diff --git a/specification/keyvault/resource-manager/readme.csharp.md b/specification/keyvault/resource-manager/readme.csharp.md
index 135ae2549748..6599bb99c526 100644
--- a/specification/keyvault/resource-manager/readme.csharp.md
+++ b/specification/keyvault/resource-manager/readme.csharp.md
@@ -9,7 +9,6 @@ This is the AutoRest configuration file for DNS.
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 clear-output-folder: true
-payload-flattening-threshold: 2
 namespace: Microsoft.Azure.Management.KeyVault
 output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Generated
 ```
diff --git a/specification/network/resource-manager/readme.csharp.md b/specification/network/resource-manager/readme.csharp.md
index 21bcc889856b..62d4530df17f 100644
--- a/specification/network/resource-manager/readme.csharp.md
+++ b/specification/network/resource-manager/readme.csharp.md
@@ -13,7 +13,6 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 ``` yaml !$(MultiApi)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
-payload-flattening-threshold: 1
 clear-output-folder: true
 namespace: Microsoft.Azure.Management.Network
 output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
diff --git a/specification/storage/resource-manager/readme.csharp.md b/specification/storage/resource-manager/readme.csharp.md
index 12ab842f4d31..05dfc5bf68d6 100644
--- a/specification/storage/resource-manager/readme.csharp.md
+++ b/specification/storage/resource-manager/readme.csharp.md
@@ -11,8 +11,8 @@ azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 clear-output-folder: true
 payload-flattening-threshold: 2
+namespace: Microsoft.Azure.Management.Storage
 output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
-namespace: Microsoft.Azure.Management.Storage  
 ```
 
 ## Batch settings
diff --git a/specification/subscription/resource-manager/readme.csharp.md b/specification/subscription/resource-manager/readme.csharp.md
index 229a88206665..4a7e2bd308e1 100644
--- a/specification/subscription/resource-manager/readme.csharp.md
+++ b/specification/subscription/resource-manager/readme.csharp.md
@@ -12,10 +12,10 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 
 ``` yaml !$(MultiApi)
 azure-arm: true
-namespace: Microsoft.Azure.Management.Subscription
 license-header: MICROSOFT_MIT_NO_VERSION
-output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Generated
 clear-output-folder: true
+namespace: Microsoft.Azure.Management.Subscription
+output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Generated
 ```
 
 ## Batch settings
diff --git a/specification/web/resource-manager/readme.csharp.md b/specification/web/resource-manager/readme.csharp.md
index fed8de768305..4e943cc6108c 100644
--- a/specification/web/resource-manager/readme.csharp.md
+++ b/specification/web/resource-manager/readme.csharp.md
@@ -11,9 +11,9 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 ``` yaml !$(MultiApi)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
+clear-output-folder: true
 namespace: Microsoft.Azure.Management.WebSites
 output-folder: $(csharp-sdks-folder)/WebSites/Management.WebSites/Generated
-clear-output-folder: true
 ```
 
 ## Batch settings

From 1464845c7e23ac2d7890800712227ec3c668f8a4 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 2 May 2018 13:27:00 -0700
Subject: [PATCH 3/5] Updating Authorization, Resource manager multi api tags
 for Azure Stack

---
 .../stable/2015-07-01/authorization.json      |  2 +-
 .../resource-manager/readme.csharp.md         | 34 +++++++++++++++++--
 .../stable/2015-01-01/locks.json              |  4 +--
 .../stable/2016-02-01/resources.json          |  2 +-
 .../resource-manager/readme.csharp.md         | 31 ++++++++++++++++-
 5 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/stable/2015-07-01/authorization.json b/specification/authorization/resource-manager/Microsoft.Authorization/stable/2015-07-01/authorization.json
index f6381d8809fa..56c2ea47c72b 100644
--- a/specification/authorization/resource-manager/Microsoft.Authorization/stable/2015-07-01/authorization.json
+++ b/specification/authorization/resource-manager/Microsoft.Authorization/stable/2015-07-01/authorization.json
@@ -1304,7 +1304,7 @@
       "in": "query",
       "required": true,
       "type": "string",
-      "description": "The API version to use for this operation."
+      "description": "The API version to use for the operation."
     }
   }
 }
\ No newline at end of file
diff --git a/specification/authorization/resource-manager/readme.csharp.md b/specification/authorization/resource-manager/readme.csharp.md
index d51d36a66dd7..c6c98dac4988 100644
--- a/specification/authorization/resource-manager/readme.csharp.md
+++ b/specification/authorization/resource-manager/readme.csharp.md
@@ -25,6 +25,36 @@ namespace: Microsoft.Azure.Management.Authorization.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
 batch:
-  - tag: package-2015-07
-    ApiVersionName: Api2015_07_01
+- tag: package-2015-07-AzStack
+  ApiVersionName: Api2015_07_01
+- tag: package-2017-10-AzStk
+  ApiVersionName: Api2017_10_01
+```
+
+## Tag: Packages for Azure Stack
+
+### Tag: package-2015-07-AzStk
+
+These settings apply only when `--tag=package-2015-07-AzStk` is specified on the command line.
+
+``` yaml $(tag) == 'package-2015-07-AzStk'
+input-file:
+- Microsoft.Authorization/stable/2015-07-01/authorization.json
+- ../../resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
+- ../../resources/resource-manager/Microsoft.Authorization/preview/2015-10-01-preview/policy.json
+override-info:
+    title: AuthorizationManagementClient
+```
+
+### Tag: package-2017-10-AzStk
+
+These settings apply only when `--tag=package-2017-10-AzStk` is specified on the command line.
+
+``` yaml $(tag) == 'package-2017-10-AzStk'
+input-file:
+- Microsoft.Authorization\preview\2017-10-01-preview\authorization-RACalls.json
+- ../../resources/resource-manager/Microsoft.Authorization/stable/2016-12-01/policyAssignments.json
+- ../../resources/resource-manager/Microsoft.Authorization/stable/2016-12-01/policyDefinitions.json
+override-info:
+    title: AuthorizationManagementClient
 ```
\ No newline at end of file
diff --git a/specification/resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json b/specification/resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
index 35c0aaabdea0..41a03445f654 100644
--- a/specification/resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
+++ b/specification/resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
@@ -664,14 +664,14 @@
       "in": "path",
       "required": true,
       "type": "string",
-      "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+      "description": "The ID of the target subscription."
     },
     "ApiVersionParameter": {
       "name": "api-version",
       "in": "query",
       "required": true,
       "type": "string",
-      "description": "Client Api Version."
+      "description": "The API version to use for the operation."
     }
   }
 }
diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2016-02-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2016-02-01/resources.json
index 5c2b986b863e..a5ca1179ff39 100644
--- a/specification/resources/resource-manager/Microsoft.Resources/stable/2016-02-01/resources.json
+++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2016-02-01/resources.json
@@ -2542,7 +2542,7 @@
       "in": "path",
       "required": true,
       "type": "string",
-      "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+      "description": "The ID of the target subscription."
     },
     "ApiVersionParameter": {
       "name": "api-version",
diff --git a/specification/resources/resource-manager/readme.csharp.md b/specification/resources/resource-manager/readme.csharp.md
index cd5863361456..88a36f0a669d 100644
--- a/specification/resources/resource-manager/readme.csharp.md
+++ b/specification/resources/resource-manager/readme.csharp.md
@@ -23,6 +23,7 @@ batch:
 #  - package-managedapplications: true
 ```
 
+
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
@@ -31,6 +32,34 @@ namespace: Microsoft.Azure.Management.ResourceManager.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
 batch:
-   - tag: package-resources-2016-02
+   - tag: package-2016-02-AzStk
      ApiVersionName: Api2016_02_01
+   - tag: package-2018-02-AzStk
+     ApiVersionName: Api2018_02_01
+```
+
+## Tag: Packages for Azure Stack
+
+### Tag: package-2016-02-AzStk
+
+These settings apply only when `--tag=package-2016-02-AzStk` is specified on the command line.
+
+``` yaml $(tag) == 'package-2016-02-AzStk'
+input-file:
+- Microsoft.Resources\stable\2016-02-01\resources.json
+- Microsoft.Resources\stable\2016-09-01\links.json
+- Microsoft.Resources\stable\2016-06-01\subscriptions.json
+override-info:
+    title: ResourceManagementClient
+```
+
+### Tag: package-2018-02-AzStk
+
+These settings apply only when `--tag=package-2018-02-AzStk` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-02-AzStk'
+input-file:
+- Microsoft.Resources\stable\2018-02-01\resources.json
+# override-info:
+#     title: ResourceManagementClient
 ```
\ No newline at end of file

From c1239629d54f9022c5ebd4491a6cd4b98bbdda25 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 2 May 2018 13:36:23 -0700
Subject: [PATCH 4/5] Fixing to the correct tag name

---
 specification/authorization/resource-manager/readme.csharp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/authorization/resource-manager/readme.csharp.md b/specification/authorization/resource-manager/readme.csharp.md
index c6c98dac4988..3523faecab30 100644
--- a/specification/authorization/resource-manager/readme.csharp.md
+++ b/specification/authorization/resource-manager/readme.csharp.md
@@ -25,7 +25,7 @@ namespace: Microsoft.Azure.Management.Authorization.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
 batch:
-- tag: package-2015-07-AzStack
+- tag: package-2015-07-AzStk
   ApiVersionName: Api2015_07_01
 - tag: package-2017-10-AzStk
   ApiVersionName: Api2017_10_01

From 5daadb0433911672c580c00eb3938e66ac7cb788 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Fri, 4 May 2018 18:59:56 -0700
Subject: [PATCH 5/5] adjusting casing for multiapi switch. Adding defualt
 config setting for CSharp generation. Adding tags for Resoruce Manager azure
 stack multiapi generation.

---
 .../resource-manager/readme.csharp.md         |  35 ++--
 .../compute/resource-manager/readme.csharp.md |  28 ++-
 .../resource-manager/readme.csharp.md         |  14 +-
 .../network/resource-manager/readme.csharp.md |  14 +-
 .../resource-manager/readme.csharp.md         | 175 +++++++++++++++---
 .../storage/resource-manager/readme.csharp.md |  14 +-
 .../resource-manager/readme.csharp.md         |  14 +-
 .../web/resource-manager/readme.csharp.md     |  12 +-
 8 files changed, 240 insertions(+), 66 deletions(-)

diff --git a/specification/authorization/resource-manager/readme.csharp.md b/specification/authorization/resource-manager/readme.csharp.md
index 3523faecab30..610c1dfaa753 100644
--- a/specification/authorization/resource-manager/readme.csharp.md
+++ b/specification/authorization/resource-manager/readme.csharp.md
@@ -8,27 +8,40 @@ These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ## Common C# Settings
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.Authorization
 output-folder: $(csharp-sdks-folder)/Authorization/Management.Authorization/Generated
 ```
 
+
+
+
+
+
+
+
+
+
+
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.Authorization.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
 batch:
 - tag: package-2015-07-AzStk
   ApiVersionName: Api2015_07_01
-- tag: package-2017-10-AzStk
-  ApiVersionName: Api2017_10_01
+#- tag: package-2017-10-AzStk
+#  ApiVersionName: Api2017_10_01
 ```
 
 ## Tag: Packages for Azure Stack
@@ -40,10 +53,10 @@ These settings apply only when `--tag=package-2015-07-AzStk` is specified on the
 ``` yaml $(tag) == 'package-2015-07-AzStk'
 input-file:
 - Microsoft.Authorization/stable/2015-07-01/authorization.json
-- ../../resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
-- ../../resources/resource-manager/Microsoft.Authorization/preview/2015-10-01-preview/policy.json
-override-info:
-    title: AuthorizationManagementClient
+#- ../../resources/resource-manager/Microsoft.Authorization/stable/2015-01-01/locks.json
+#- ../../resources/resource-manager/Microsoft.Authorization/preview/2015-10-01-preview/policy.json
+#override-info:
+#    title: AuthorizationManagementClient
 ```
 
 ### Tag: package-2017-10-AzStk
diff --git a/specification/compute/resource-manager/readme.csharp.md b/specification/compute/resource-manager/readme.csharp.md
index 0983df045da5..7220e59d67c2 100644
--- a/specification/compute/resource-manager/readme.csharp.md
+++ b/specification/compute/resource-manager/readme.csharp.md
@@ -9,19 +9,35 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 
 ## Common C# settings
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-payload-flattening-threshold: 1
-clear-output-folder: true
+
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.Compute
 output-folder: $(csharp-sdks-folder)/Compute/Management.Compute/Generated
 ```
 
+
+
+
+
+
+
+
+
+
+
+
+
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.Compute.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
diff --git a/specification/keyvault/resource-manager/readme.csharp.md b/specification/keyvault/resource-manager/readme.csharp.md
index 6599bb99c526..4ecfd6055640 100644
--- a/specification/keyvault/resource-manager/readme.csharp.md
+++ b/specification/keyvault/resource-manager/readme.csharp.md
@@ -5,10 +5,14 @@
 This is the AutoRest configuration file for DNS.
 
 ## Common settings
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.KeyVault
 output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Generated
 ```
@@ -16,7 +20,7 @@ output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Gen
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.KeyVault.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
diff --git a/specification/network/resource-manager/readme.csharp.md b/specification/network/resource-manager/readme.csharp.md
index 62d4530df17f..1a63171a11af 100644
--- a/specification/network/resource-manager/readme.csharp.md
+++ b/specification/network/resource-manager/readme.csharp.md
@@ -10,10 +10,14 @@ These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ## Common Settings
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.Network
 output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
 ```
@@ -21,7 +25,7 @@ output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
 ## MultiApi settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.Network.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
diff --git a/specification/resources/resource-manager/readme.csharp.md b/specification/resources/resource-manager/readme.csharp.md
index 88a36f0a669d..c420ceaee52c 100644
--- a/specification/resources/resource-manager/readme.csharp.md
+++ b/specification/resources/resource-manager/readme.csharp.md
@@ -5,11 +5,14 @@
 This is the AutoRest configuration file for DNS.
 
 ## Common C# Settings
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.ResourceManager  
 output-folder: $(csharp-sdks-folder)/Resource/Management.ResourceManager/Generated
 
@@ -24,42 +27,164 @@ batch:
 ```
 
 
-## Batch settings
+
+
+
+
+
+
+
+
+
+## Azure Stack Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.ResourceManager.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
 batch:
-   - tag: package-2016-02-AzStk
-     ApiVersionName: Api2016_02_01
-   - tag: package-2018-02-AzStk
-     ApiVersionName: Api2018_02_01
+  - resources-2016-02-01: true
+    ApiVersionName: Api2016_02_01
+  - links-2016-09-01: true
+    ApiVersionName: Api2016_02_01
+  - subscription-2016-06-01: true
+    ApiVersionName: Api2016_02_01
+  - locks-2015-01-01: true
+    ApiVersionName: Api2016_02_01
+  - policy-2015-10-01: true
+    ApiVersionName: Api2016_02_01
+
+  - resources-2018-02-01: true
+    ApiVersionName: Api2018_02_01
+  - links-2016-09-01: true
+    ApiVersionName: Api2018_02_01
+  - subscription-2016-06-01: true
+    ApiVersionName: Api2018_02_01
+  - locks-2016-09-01: true
+    ApiVersionName: Api2018_02_01
+  - policyA-2016-12-01: true
+    ApiVersionName: Api2018_02_01
+  - policyD-2016-12-01: true
+    ApiVersionName: Api2018_02_01
+```
+
+
+``` yaml $(resources-2016-02-01)
+tag: pkg-2016-02-Az-res
+```
+
+``` yaml $(links-2016-09-01)
+tag: pkg-2016-02-Az-lnk
+```
+
+``` yaml $(subscription-2016-06-01)
+tag: pkg-2016-02-Az-sub
+```
+
+``` yaml $(locks-2015-01-01)
+tag: pkg-2016-02-Az-loc
+```
+
+``` yaml $(policy-2015-10-01)
+tag: pkg-2016-02-Az-pol
 ```
 
 ## Tag: Packages for Azure Stack
+### 1) pkg-2016-02-AzStk-res
+``` yaml $(tag) == 'pkg-2016-02-Az-res'
+input-file:
+- Microsoft.Resources/stable/2016-02-01/resources.json
+```
 
-### Tag: package-2016-02-AzStk
+### 2) pkg-2016-02-AzStk-lnk
+``` yaml $(tag) == 'pkg-2016-02-Az-lnk'
+input-file:
+- Microsoft.Resources/stable/2016-09-01/links.json
+```
 
-These settings apply only when `--tag=package-2016-02-AzStk` is specified on the command line.
+### 3) pkg-2016-02-AzStk-sub
+``` yaml $(tag) == 'pkg-2016-02-Az-sub'
+input-file:
+- Microsoft.Resources/stable/2016-06-01/subscriptions.json
+```
 
-``` yaml $(tag) == 'package-2016-02-AzStk'
+### 4) pkg-2016-02-AzStk-loc
+``` yaml $(tag) == 'pkg-2016-02-Az-loc'
 input-file:
-- Microsoft.Resources\stable\2016-02-01\resources.json
-- Microsoft.Resources\stable\2016-09-01\links.json
-- Microsoft.Resources\stable\2016-06-01\subscriptions.json
-override-info:
-    title: ResourceManagementClient
+- Microsoft.Authorization/stable/2015-01-01/locks.json
 ```
 
-### Tag: package-2018-02-AzStk
+### 5) pkg-2016-02-AzStk-pol
+``` yaml $(tag) == 'pkg-2016-02-Az-pol'
+input-file:
+- Microsoft.Authorization/preview/2015-10-01-preview/policy.json
+```
+
+``` yaml $(Seperator)
+###########################################################################
+###########################################################################
+```
 
-These settings apply only when `--tag=package-2018-02-AzStk` is specified on the command line.
 
-``` yaml $(tag) == 'package-2018-02-AzStk'
+``` yaml $(resources-2018-02-01)
+tag: pkg-2018-02-Az-res
+```
+
+``` yaml $(links-2016-09-01)
+tag: pkg-2018-02-Az-lnk
+```
+
+``` yaml $(subscription-2016-06-01)
+tag: pkg-2018-02-Az-sub
+```
+
+``` yaml $(locks-2016-09-01)
+tag: pkg-2018-02-Az-loc
+```
+
+``` yaml $(policyA-2016-12-01)
+tag: pkg-2018-02-Az-polA
+```
+
+``` yaml $(policyD-2016-12-01)
+tag: pkg-2018-02-Az-polD
+```
+
+
+## Tag: Packages for Azure Stack
+### 1) pkg-2018-02-AzStk-res
+``` yaml $(tag) == 'pkg-2018-02-Az-res'
+input-file:
+- Microsoft.Resources/stable/2018-02-01/resources.json
+```
+
+### 2) pkg-2018-02-AzStk-lnk
+``` yaml $(tag) == 'pkg-2018-02-Az-lnk'
+input-file:
+- Microsoft.Resources/stable/2016-09-01/links.json
+```
+
+### 3) pkg-2018-02-AzStk-sub
+``` yaml $(tag) == 'pkg-2018-02-Az-sub'
+input-file:
+- Microsoft.Resources/stable/2016-06-01/subscriptions.json
+```
+
+### 4) pkg-2018-02-AzStk-loc
+``` yaml $(tag) == 'pkg-2018-02-Az-loc'
 input-file:
-- Microsoft.Resources\stable\2018-02-01\resources.json
-# override-info:
-#     title: ResourceManagementClient
-```
\ No newline at end of file
+- Microsoft.Authorization/stable/2016-09-01/locks.json
+```
+
+### 5) pkg-2018-02-AzStk-polA
+``` yaml $(tag) == 'pkg-2018-02-Az-polA'
+input-file:
+- Microsoft.Authorization/stable/2016-12-01/policyAssignments.json
+```
+
+### 6) pkg-2018-02-AzStk-polD
+``` yaml $(tag) == 'pkg-2018-02-Az-polD'
+input-file:
+- Microsoft.Authorization/stable/2016-12-01/policyDefinitions.json
+```
diff --git a/specification/storage/resource-manager/readme.csharp.md b/specification/storage/resource-manager/readme.csharp.md
index 05dfc5bf68d6..3cdac4549aa3 100644
--- a/specification/storage/resource-manager/readme.csharp.md
+++ b/specification/storage/resource-manager/readme.csharp.md
@@ -6,10 +6,14 @@ This is the AutoRest configuration file for DNS.
 
 ## Common C# Settings
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 payload-flattening-threshold: 2
 namespace: Microsoft.Azure.Management.Storage
 output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
@@ -18,7 +22,7 @@ output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.Storage.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
diff --git a/specification/subscription/resource-manager/readme.csharp.md b/specification/subscription/resource-manager/readme.csharp.md
index 4a7e2bd308e1..94ba1e9fa130 100644
--- a/specification/subscription/resource-manager/readme.csharp.md
+++ b/specification/subscription/resource-manager/readme.csharp.md
@@ -10,10 +10,14 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 
 ## Common C# Settings
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.Subscription
 output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Generated
 ```
@@ -21,7 +25,7 @@ output-folder: $(csharp-sdks-folder)/Subscription/Management.Subscription/Genera
 ## Batch settings
 These settings are for batch mode only: (ie, add `--MultiApi` to the command line )
 
-``` yaml $(MultiApi)
+``` yaml $(multiApi)
 namespace: Microsoft.Azure.Management.Subscription.$(ApiVersionName)
 output-folder: $(csharp-sdks-folder)/$(ApiVersionName)/Generated
 
diff --git a/specification/web/resource-manager/readme.csharp.md b/specification/web/resource-manager/readme.csharp.md
index 4e943cc6108c..90379709dd65 100644
--- a/specification/web/resource-manager/readme.csharp.md
+++ b/specification/web/resource-manager/readme.csharp.md
@@ -8,10 +8,14 @@ This is the AutoRest configuration file for DNS.
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml !$(MultiApi)
-azure-arm: true
-license-header: MICROSOFT_MIT_NO_VERSION
-clear-output-folder: true
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION  
+  clear-output-folder: true
+```
+
+``` yaml $(csharp) && !$(multiApi)
 namespace: Microsoft.Azure.Management.WebSites
 output-folder: $(csharp-sdks-folder)/WebSites/Management.WebSites/Generated
 ```