From e03bfc8e8e3bd0bb072f04cfe49b4edef50bd13e Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Wed, 12 May 2021 10:51:56 +0800
Subject: [PATCH 1/7] sql t2 readme config

---
 specification/sql/resource-manager/readme.md  | 29 +----------
 .../sql/resource-manager/readme.python.md     | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+), 27 deletions(-)
 create mode 100644 specification/sql/resource-manager/readme.python.md

diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md
index 9e6aeaadf6a6..e98d72fc8cef 100644
--- a/specification/sql/resource-manager/readme.md
+++ b/specification/sql/resource-manager/readme.md
@@ -1426,6 +1426,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-node
@@ -1452,33 +1453,7 @@ csharp:
 
 ### Python
 
-These settings apply only when `--python` is specified on the command line.
-Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
-Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
-
-``` yaml $(python)
-python-mode: create
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  namespace: azure.mgmt.sql
-  package-name: azure-mgmt-sql
-  package-version: 0.9.0
-  clear-output-folder: true
-```
-
-``` yaml $(python) && $(python-mode) == 'update'
-python:
-  no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
-```
-
-``` yaml $(python) && $(python-mode) == 'create'
-python:
-  basic-setup-py: true
-  output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
-```
+See configuration in [readme.python.md](./readme.python.md)
 
 ### Go
 
diff --git a/specification/sql/resource-manager/readme.python.md b/specification/sql/resource-manager/readme.python.md
new file mode 100644
index 000000000000..fff44f6b620b
--- /dev/null
+++ b/specification/sql/resource-manager/readme.python.md
@@ -0,0 +1,49 @@
+### Python
+
+These settings apply only when `--python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
+
+``` yaml $(python)&& !$(track2)
+python-mode: create
+python:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+  namespace: azure.mgmt.sql
+  package-name: azure-mgmt-sql
+  package-version: 0.9.0
+  clear-output-folder: true
+```
+
+``` yaml $(python)&& $(track2)
+python-mode: create
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+namespace: azure.mgmt.sql
+package-name: azure-mgmt-sql
+package-version: 0.9.0
+clear-output-folder: true
+```
+
+``` yaml $(python) && $(python-mode) == 'update'&& !$(track2)
+python:
+  no-namespace-folders: true
+  output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
+```
+
+``` yaml $(python) && $(python-mode) == 'create'&& !$(track2)
+python:
+  basic-setup-py: true
+  output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
+```
+
+``` yaml $(python) && $(python-mode) == 'update'&& $(track2)
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
+```
+
+``` yaml $(python) && $(python-mode) == 'create'&& $(track2)
+basic-setup-py: true
+output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
+```
\ No newline at end of file

From 70e264164f09afa16ea72e31c4d8d050f35262d0 Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Wed, 12 May 2021 11:22:07 +0800
Subject: [PATCH 2/7] readme config

---
 specification/sql/resource-manager/readme.python.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/specification/sql/resource-manager/readme.python.md b/specification/sql/resource-manager/readme.python.md
index fff44f6b620b..39b86e5fe800 100644
--- a/specification/sql/resource-manager/readme.python.md
+++ b/specification/sql/resource-manager/readme.python.md
@@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
 
-``` yaml $(python)&& !$(track2)
+``` yaml $(python) && !$(track2)
 python-mode: create
 python:
   azure-arm: true
@@ -16,7 +16,7 @@ python:
   clear-output-folder: true
 ```
 
-``` yaml $(python)&& $(track2)
+``` yaml $(python) && $(track2)
 python-mode: create
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
@@ -26,24 +26,24 @@ package-version: 0.9.0
 clear-output-folder: true
 ```
 
-``` yaml $(python) && $(python-mode) == 'update'&& !$(track2)
+``` yaml $(python) && $(python-mode) == 'update' && !$(track2)
 python:
   no-namespace-folders: true
   output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
 ```
 
-``` yaml $(python) && $(python-mode) == 'create'&& !$(track2)
+``` yaml $(python) && $(python-mode) == 'create' && !$(track2)
 python:
   basic-setup-py: true
   output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
 ```
 
-``` yaml $(python) && $(python-mode) == 'update'&& $(track2)
+``` yaml $(python) && $(python-mode) == 'update' && $(track2)
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
 ```
 
-``` yaml $(python) && $(python-mode) == 'create'&& $(track2)
+``` yaml $(python) && $(python-mode) == 'create' && $(track2)
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
 ```
\ No newline at end of file

From 624cc268b2651df4e4a7a09759958adf80247557 Mon Sep 17 00:00:00 2001
From: msyyc <70930885+msyyc@users.noreply.github.com>
Date: Wed, 12 May 2021 15:27:30 +0800
Subject: [PATCH 3/7] Update readme.python.md

---
 specification/sql/resource-manager/readme.python.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/specification/sql/resource-manager/readme.python.md b/specification/sql/resource-manager/readme.python.md
index 39b86e5fe800..ec2988c8da73 100644
--- a/specification/sql/resource-manager/readme.python.md
+++ b/specification/sql/resource-manager/readme.python.md
@@ -24,6 +24,8 @@ namespace: azure.mgmt.sql
 package-name: azure-mgmt-sql
 package-version: 0.9.0
 clear-output-folder: true
+modelerfour:
+  lenient-model-deduplication: true
 ```
 
 ``` yaml $(python) && $(python-mode) == 'update' && !$(track2)
@@ -46,4 +48,4 @@ output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
 ``` yaml $(python) && $(python-mode) == 'create' && $(track2)
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
-```
\ No newline at end of file
+```

From 72dd592bd16b790869c73c8ea3962ec326ee3270 Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Thu, 13 May 2021 10:09:49 +0800
Subject: [PATCH 4/7] conflient resolve

---
 specification/sql/resource-manager/readme.python.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/specification/sql/resource-manager/readme.python.md b/specification/sql/resource-manager/readme.python.md
index 64da894d43b7..ec2988c8da73 100644
--- a/specification/sql/resource-manager/readme.python.md
+++ b/specification/sql/resource-manager/readme.python.md
@@ -48,8 +48,4 @@ output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql/azure/mgmt/sql
 ``` yaml $(python) && $(python-mode) == 'create' && $(track2)
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/sql/azure-mgmt-sql
-<<<<<<< HEAD
 ```
-=======
-```
->>>>>>> azure/master

From 86a2c327d58ad1ace2c0da8d0d524df45e852eec Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Mon, 24 May 2021 11:04:15 +0800
Subject: [PATCH 5/7] t2 config

---
 specification/eventgrid/resource-manager/readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/specification/eventgrid/resource-manager/readme.md b/specification/eventgrid/resource-manager/readme.md
index 294ad152d65d..5877c8a4782f 100644
--- a/specification/eventgrid/resource-manager/readme.md
+++ b/specification/eventgrid/resource-manager/readme.md
@@ -175,6 +175,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
@@ -200,6 +201,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Python
+
+See configuration in [readme.python.md](./readme.python.md)
+
 ## Go
 
 See configuration in [readme.go.md](./readme.go.md)

From c625dd27f63e7fec2d0db3d5b876d01553e673b6 Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Mon, 24 May 2021 13:47:07 +0800
Subject: [PATCH 6/7] t2 config

---
 specification/cognitiveservices/resource-manager/readme.md | 5 +++++
 specification/eventgrid/resource-manager/readme.md         | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/specification/cognitiveservices/resource-manager/readme.md b/specification/cognitiveservices/resource-manager/readme.md
index 814de0656006..fe2aad3a95f4 100644
--- a/specification/cognitiveservices/resource-manager/readme.md
+++ b/specification/cognitiveservices/resource-manager/readme.md
@@ -72,6 +72,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
@@ -97,6 +98,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Python
+
+See configuration in [readme.python.md](./readme.python.md)
+
 ## Go
 
 See configuration in [readme.go.md](./readme.go.md)
diff --git a/specification/eventgrid/resource-manager/readme.md b/specification/eventgrid/resource-manager/readme.md
index 5877c8a4782f..1d28c76c0eec 100644
--- a/specification/eventgrid/resource-manager/readme.md
+++ b/specification/eventgrid/resource-manager/readme.md
@@ -175,7 +175,6 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python
-  - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
@@ -200,11 +199,6 @@ csharp:
   output-folder: $(csharp-sdks-folder)/eventgrid/Microsoft.Azure.Management.EventGrid/src/Generated
   clear-output-folder: true
 ```
-
-## Python
-
-See configuration in [readme.python.md](./readme.python.md)
-
 ## Go
 
 See configuration in [readme.go.md](./readme.go.md)

From 09f6dbed8176af1cf3395a58b796f6e8f24d2725 Mon Sep 17 00:00:00 2001
From: Zed <601306339@qq.com>
Date: Mon, 24 May 2021 13:47:58 +0800
Subject: [PATCH 7/7] t2 config

---
 specification/eventgrid/resource-manager/readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/specification/eventgrid/resource-manager/readme.md b/specification/eventgrid/resource-manager/readme.md
index 1d28c76c0eec..294ad152d65d 100644
--- a/specification/eventgrid/resource-manager/readme.md
+++ b/specification/eventgrid/resource-manager/readme.md
@@ -199,6 +199,7 @@ csharp:
   output-folder: $(csharp-sdks-folder)/eventgrid/Microsoft.Azure.Management.EventGrid/src/Generated
   clear-output-folder: true
 ```
+
 ## Go
 
 See configuration in [readme.go.md](./readme.go.md)