upgrade websites module to autorest v4

src/Websites/Websites.Autorest/Az.Websites.nuspec

@@ -13,7 +13,7 @@
     <copyright>Microsoft Corporation. All rights reserved.</copyright>
     <tags>Azure ResourceManager ARM PSModule $(service-name)</tags>
     <dependencies>
-      <dependency id="Az.Accounts" version="2.2.3" />
+      <dependency id="Az.Accounts" version="2.7.5" />
     </dependencies>
   </metadata>
   <files>
@@ -23,9 +23,9 @@
     <!-- https://github.com/NuGet/Home/issues/3584 -->
     <file src="bin/Az.Websites.private.dll" target="bin" />
     <file src="bin\Az.Websites.private.deps.json" target="bin" />
-    <file src="internal\**\*.*" exclude="internal\readme.md" target="internal" />
-    <file src="custom\**\*.*" exclude="custom\readme.md;custom\**\*.cs" target="custom" />
-    <file src="docs\**\*.md" exclude="docs\readme.md" target="docs" />
+    <file src="internal\**\*.*" exclude="internal\README.md" target="internal" />
+    <file src="custom\**\*.*" exclude="custom\README.md;custom\**\*.cs" target="custom" />
+    <file src="docs\**\*.md" exclude="docs\README.md" target="docs" />
     <file src="exports\**\ProxyCmdletDefinitions.ps1" target="exports" />
     <file src="utils\**\*.*" target="utils" />
   </files>

src/Websites/Websites.Autorest/Properties/AssemblyInfo.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ""AS IS"" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Websites")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("3.4.1")]
+[assembly: System.Reflection.AssemblyVersionAttribute("3.4.1")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]

src/Websites/Websites.Autorest/README.md

@@ -37,13 +37,6 @@ input-file:
 title: Websites
 module-version: 0.1.0
 subject-prefix: $(service-name)
-identity-correction-for-post: true
-resourcegroup-append: true
-nested-object-to-string: true
-
-# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
-use-extension:
-  "@autorest/powershell": "3.x"
 
 directive:
   #Modify operationId
@@ -206,58 +199,20 @@ directive:
       verb: Unregister
       subject: BuildUserProvidedFunctionApp
 
-# Remove variant
+  # Remove variant
   # Following is two common directive which are normally required in all the RPs
   # 1. Remove the unexpanded parameter set
   # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
   - where:
-      variant: ^CreateViaIdentityExpanded$|^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: CustomDomain
-
-    remove: true
-  - where:
-      verb: Test
-      variant: ^Validate$|^ValidateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: CustomDomain
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: BuildAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: FunctionAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: Setting
+      subject: CustomDomain|BuildAppSetting|FunctionAppSetting|Setting|BuildFunctionAppSetting|UserRoleInvitationLink
+      variant: ^Create(?!.*?(Expanded|JsonFilePath|JsonString))
     remove: true
 
   - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
+      variant: ^CreateViaIdentityExpanded$
       # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
       # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: BuildFunctionAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: UserRoleInvitationLink
+      subject: CustomDomain
     remove: true
 
   - where:
@@ -272,6 +227,14 @@ directive:
       variant: ^Update$|^UpdateViaIdentity$
     remove: true
 
+  - where:
+      verb: Test
+      variant: ^Validate$|^ValidateViaIdentity$
+      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
+      # CreateExpanded variant, because the only parameters are all in URL rather than request body
+      subject: CustomDomain
+    remove: true
+
   - where:
       verb: Reset
       subject: ApiKey