diff --git a/build.proj b/build.proj
index e6fbd48a5c4f..698fd8c68faa 100644
--- a/build.proj
+++ b/build.proj
@@ -191,7 +191,8 @@
       <BuildAction Condition="'$(Configuration)' != 'Release'">build</BuildAction>
       <BuildAction Condition="'$(Configuration)' == 'Release'">publish</BuildAction>
     </PropertyGroup>
-    <Exec Command="dotnet $(BuildAction) $(RepoArtifacts)Azure.PowerShell.sln -c $(Configuration)" />
+    <Exec Command="dotnet $(BuildAction) $(RepoArtifacts)Azure.PowerShell.sln -c $(Configuration)" Condition="$(GenerateDocumentationFile) == 'true'"/>
+    <Exec Command="dotnet $(BuildAction) $(RepoArtifacts)Azure.PowerShell.sln -c $(Configuration) -p:GenerateDocumentationFile=false" Condition="$(GenerateDocumentationFile) == 'false'"/>
 
     <!-- Build version controller -->
     <Exec Command="dotnet build $(RepoTools)VersionController/VersionController.Netcore.csproj -c $(Configuration)" />
diff --git a/src/ADDomainServices/Az.ADDomainServices.csproj b/src/ADDomainServices/Az.ADDomainServices.csproj
index 92aef5ebc61f..c5ae665afee0 100644
--- a/src/ADDomainServices/Az.ADDomainServices.csproj
+++ b/src/ADDomainServices/Az.ADDomainServices.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Accounts/Accounts/Accounts.csproj b/src/Accounts/Accounts/Accounts.csproj
index a9e7a81f1f0f..f4c3c5754f44 100644
--- a/src/Accounts/Accounts/Accounts.csproj
+++ b/src/Accounts/Accounts/Accounts.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Accounts</PsModuleName>
@@ -64,4 +64,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj b/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
index 7e55005a3a25..3f7b6bd70533 100644
--- a/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
+++ b/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Accounts</PsModuleName>
@@ -30,4 +30,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Accounts/Authentication/Authentication.csproj b/src/Accounts/Authentication/Authentication.csproj
index 5faf000780ec..e195585e7d19 100644
--- a/src/Accounts/Authentication/Authentication.csproj
+++ b/src/Accounts/Authentication/Authentication.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Accounts</PsModuleName>
@@ -30,4 +30,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj b/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
index 1fc7884c59f0..6fb4a1a0ca96 100644
--- a/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
+++ b/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>Accounts</PsModuleName>
   </PropertyGroup>
@@ -22,4 +22,6 @@
     <AssemblyOriginatorKeyFile>$(RepoSrc)MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
     <DefineConstants>TRACE;RELEASE;SIGN</DefineConstants>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Accounts/Authenticators/Authenticators.csproj b/src/Accounts/Authenticators/Authenticators.csproj
index e06960b0baf1..64cc2e91fb39 100644
--- a/src/Accounts/Authenticators/Authenticators.csproj
+++ b/src/Accounts/Authenticators/Authenticators.csproj
@@ -37,4 +37,6 @@
     <Copy SourceFiles="@(OutputAssembly)" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.Accounts\PreloadAssemblies" />
   </Target>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Advisor/Advisor/Advisor.csproj b/src/Advisor/Advisor/Advisor.csproj
index f77273a6182f..943a7382fee1 100644
--- a/src/Advisor/Advisor/Advisor.csproj
+++ b/src/Advisor/Advisor/Advisor.csproj
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Advisor" Version="0.9.5-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Aks/Aks.Autorest/Az.Aks.csproj b/src/Aks/Aks.Autorest/Az.Aks.csproj
index 99f6d0b0980a..27f024a7aa08 100644
--- a/src/Aks/Aks.Autorest/Az.Aks.csproj
+++ b/src/Aks/Aks.Autorest/Az.Aks.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Aks/Aks/Aks.csproj b/src/Aks/Aks/Aks.csproj
index a74ef2f4693b..c771e5dc3c88 100644
--- a/src/Aks/Aks/Aks.csproj
+++ b/src/Aks/Aks/Aks.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Aks</PsModuleName>
@@ -32,4 +32,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj b/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
index 368fc658e6a2..766d08c4162a 100644
--- a/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
+++ b/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
@@ -25,4 +25,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj b/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
index ff245be69e55..66bb0f4366b2 100644
--- a/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
+++ b/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>AnalysisServices</PsModuleName>
@@ -10,4 +10,6 @@
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName).Dataplane</AssemblyName>
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName).Dataplane</RootNamespace>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj b/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
index 7ed720a03b06..078568b84a2c 100644
--- a/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
+++ b/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
@@ -16,4 +16,6 @@
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj b/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
index 5848f450c5e2..e1a6a259ccf5 100644
--- a/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
+++ b/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>ApiManagement</PsModuleName>
@@ -31,4 +31,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ApiManagement/ApiManagement/ApiManagement.csproj b/src/ApiManagement/ApiManagement/ApiManagement.csproj
index 46e0652737cc..061948514fd7 100644
--- a/src/ApiManagement/ApiManagement/ApiManagement.csproj
+++ b/src/ApiManagement/ApiManagement/ApiManagement.csproj
@@ -22,4 +22,6 @@
     <Compile Include="$(StorageToolsPath)Adapters\WindowsAzure.Storage.8\AzureContextAdapterExtensions.cs" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/App/Az.App.csproj b/src/App/Az.App.csproj
index 4f0470ca103a..db5428384de0 100644
--- a/src/App/Az.App.csproj
+++ b/src/App/Az.App.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/AppConfiguration/Az.AppConfiguration.csproj b/src/AppConfiguration/Az.AppConfiguration.csproj
index aff60619e9be..bef401f63e47 100644
--- a/src/AppConfiguration/Az.AppConfiguration.csproj
+++ b/src/AppConfiguration/Az.AppConfiguration.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>AppConfiguration</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/ApplicationInsights/Az.ApplicationInsights.csproj b/src/ApplicationInsights/Az.ApplicationInsights.csproj
index f2a942e91447..5737c43ab2b9 100644
--- a/src/ApplicationInsights/Az.ApplicationInsights.csproj
+++ b/src/ApplicationInsights/Az.ApplicationInsights.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Attestation/Attestation/Attestation.csproj b/src/Attestation/Attestation/Attestation.csproj
index 408106d673db..b9d6475e77fb 100644
--- a/src/Attestation/Attestation/Attestation.csproj
+++ b/src/Attestation/Attestation/Attestation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Attestation</PsModuleName>
@@ -22,4 +22,6 @@
     </Reference>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Automation/Automation/Automation.csproj b/src/Automation/Automation/Automation.csproj
index 26c3462ad133..69eeb8c28ef7 100644
--- a/src/Automation/Automation/Automation.csproj
+++ b/src/Automation/Automation/Automation.csproj
@@ -30,4 +30,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Az.Post.props b/src/Az.Post.props
new file mode 100644
index 000000000000..7e35c3d3b18c
--- /dev/null
+++ b/src/Az.Post.props
@@ -0,0 +1,9 @@
+<Project>
+  <!-- XML -->
+  <PropertyGroup>
+    <!-- warning CS1591: Missing XML comment for publicly visible type or member -->
+    <NoWarn>$(NoWarn),1591</NoWarn>
+    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+</Project>
+
diff --git a/src/Az.autorest.hybrid.props b/src/Az.autorest.hybrid.props
index ea8dfc5e7ac1..689fa3cb4628 100644
--- a/src/Az.autorest.hybrid.props
+++ b/src/Az.autorest.hybrid.props
@@ -18,8 +18,21 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\bin</OutputPath>
     <PublishDir>$(OutputPath)</PublishDir>
+    <!-- warning CS1998: This async method lacks 'await' operators and will run synchronously -->
     <!-- Some methods are marked async and don't have an await in them -->
-    <NoWarn>1998</NoWarn>
+    <NoWarn>$(NoWarn);1998</NoWarn>
+  </PropertyGroup>
+
+  <!-- Generate XML file-->
+  <PropertyGroup>
+    <!-- warning CS1570: XML comment has badly formed XML -->
+    <!-- warning CS1572: XML comment on 'construct' has a param tag for 'parameter', but there is no parameter by that name -->
+    <!-- warning CS1573: Parameter 'parameter' has no matching param tag in the XML comment for 'parameter' -->
+    <!-- warning CS1574: XML comment has cref attribute 'sourceValue' -->
+    <!-- warning CS1584: XML comment on 'member' has syntactically incorrect cref attribute 'invalid_syntax' -->
+    <!-- warning CS1587: XML comment is not placed on a valid language element -->
+    <!-- warning CS1571: XML comment has a duplicate param tag for 'serverName' -->
+    <NoWarn>$(NoWarn);1570, 1571, 1572, 1573, 1574, 1584, 1587</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Az.autorest.props b/src/Az.autorest.props
index fc82c4923de7..c0f0e7fe4168 100644
--- a/src/Az.autorest.props
+++ b/src/Az.autorest.props
@@ -14,8 +14,21 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\bin</OutputPath>
     <PublishDir>$(OutputPath)</PublishDir>
+    <!-- warning CS1998: This async method lacks 'await' operators and will run synchronously -->
     <!-- Some methods are marked async and don't have an await in them -->
-    <NoWarn>1998</NoWarn>
+    <NoWarn>$(NoWarn);1998</NoWarn>
+  </PropertyGroup>
+
+<!-- Generate XML file-->
+  <PropertyGroup>
+    <!-- warning CS1570: XML comment has badly formed XML -->
+    <!-- warning CS1572: XML comment on 'construct' has a param tag for 'parameter', but there is no parameter by that name -->
+    <!-- warning CS1573: Parameter 'parameter' has no matching param tag in the XML comment for 'parameter' -->
+    <!-- warning CS1574: XML comment has cref attribute 'sourceValue' -->
+    <!-- warning CS1584: XML comment on 'member' has syntactically incorrect cref attribute 'invalid_syntax' -->
+    <!-- warning CS1587: XML comment is not placed on a valid language element -->
+    <!-- warning CS1571: XML comment has a duplicate param tag for 'serverName' -->
+    <NoWarn>$(NoWarn);1570, 1571, 1572, 1573, 1574, 1584, 1587</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/BareMetal/Az.BareMetal.csproj b/src/BareMetal/Az.BareMetal.csproj
index b7d3cb06a7c0..583d46239e21 100644
--- a/src/BareMetal/Az.BareMetal.csproj
+++ b/src/BareMetal/Az.BareMetal.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Batch/Batch/Batch.csproj b/src/Batch/Batch/Batch.csproj
index 8568299f923d..ead0995335a8 100644
--- a/src/Batch/Batch/Batch.csproj
+++ b/src/Batch/Batch/Batch.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Batch</PsModuleName>
@@ -23,4 +23,6 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Billing/Billing/Billing.csproj b/src/Billing/Billing/Billing.csproj
index 4983bbcb5776..4fde127713c2 100644
--- a/src/Billing/Billing/Billing.csproj
+++ b/src/Billing/Billing/Billing.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Billing" Version="4.1.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Billing/Consumption/Consumption.csproj b/src/Billing/Consumption/Consumption.csproj
index 07385b0f7ba4..a5ca3c6245b7 100644
--- a/src/Billing/Consumption/Consumption.csproj
+++ b/src/Billing/Consumption/Consumption.csproj
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Consumption" Version="3.0.2" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Billing/UsageAggregates/UsageAggregates.csproj b/src/Billing/UsageAggregates/UsageAggregates.csproj
index 8f5dd69a673d..86510ea2c4ff 100644
--- a/src/Billing/UsageAggregates/UsageAggregates.csproj
+++ b/src/Billing/UsageAggregates/UsageAggregates.csproj
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Commerce.UsageAggregates" Version="1.5.3" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Blueprint/Blueprint/Blueprint.csproj b/src/Blueprint/Blueprint/Blueprint.csproj
index 32c2195be337..fae02366db02 100644
--- a/src/Blueprint/Blueprint/Blueprint.csproj
+++ b/src/Blueprint/Blueprint/Blueprint.csproj
@@ -26,4 +26,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/BotService/Az.BotService.csproj b/src/BotService/Az.BotService.csproj
index 9588d4b716df..b71b9c33d017 100644
--- a/src/BotService/Az.BotService.csproj
+++ b/src/BotService/Az.BotService.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Cdn/Az.Cdn.csproj b/src/Cdn/Az.Cdn.csproj
index 91c9b1f0e53e..9a3af5cc7c4a 100644
--- a/src/Cdn/Az.Cdn.csproj
+++ b/src/Cdn/Az.Cdn.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ChangeAnalysis/Az.ChangeAnalysis.csproj b/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
index 4532a0e3b4c8..2d84de95698f 100644
--- a/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
+++ b/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/CloudService/Az.CloudService.csproj b/src/CloudService/Az.CloudService.csproj
index ed08938f1b8a..1381e8dfc729 100644
--- a/src/CloudService/Az.CloudService.csproj
+++ b/src/CloudService/Az.CloudService.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj b/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
index f28fe736bf21..617c38ce9b81 100644
--- a/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
+++ b/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>CognitiveServices</PsModuleName>
@@ -20,4 +20,6 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Communication/Az.Communication.csproj b/src/Communication/Az.Communication.csproj
index 27d1f78e73f8..7a2a26b30936 100644
--- a/src/Communication/Az.Communication.csproj
+++ b/src/Communication/Az.Communication.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj b/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
index 8b048d5baf80..9ec7b0d8faf6 100644
--- a/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
+++ b/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
@@ -17,4 +17,6 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.1.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Compute/Compute.Autorest/Az.Compute.csproj b/src/Compute/Compute.Autorest/Az.Compute.csproj
index e1b83af36462..a783093335ee 100644
--- a/src/Compute/Compute.Autorest/Az.Compute.csproj
+++ b/src/Compute/Compute.Autorest/Az.Compute.csproj
@@ -4,4 +4,6 @@
     <PsRootModuleName>Compute</PsRootModuleName>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Compute/Compute.Helpers/Compute.Helpers.csproj b/src/Compute/Compute.Helpers/Compute.Helpers.csproj
index 987ca8fef007..267369844114 100644
--- a/src/Compute/Compute.Helpers/Compute.Helpers.csproj
+++ b/src/Compute/Compute.Helpers/Compute.Helpers.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Compute</PsModuleName>
@@ -10,7 +10,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Compute.Helpers</AssemblyName>
     <RootNamespace>Microsoft.Azure.PowerShell.Cmdlets.Compute.Helpers</RootNamespace>
-    <NoWarn>CS0108</NoWarn>
+    <NoWarn>$(NoWarn);CS0108</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
index 893dc5670266..cd8708ae6e9c 100644
--- a/src/Compute/Compute/Compute.csproj
+++ b/src/Compute/Compute/Compute.csproj
@@ -54,4 +54,6 @@
     </ProjectReference>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/ConfidentialLedger/Az.ConfidentialLedger.csproj b/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
index d544d1f51fe3..3910f3e26f89 100644
--- a/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
+++ b/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Confluent/Az.Confluent.csproj b/src/Confluent/Az.Confluent.csproj
index 6fbd9c205bf2..13bee1806d88 100644
--- a/src/Confluent/Az.Confluent.csproj
+++ b/src/Confluent/Az.Confluent.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj b/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
index dc9d6760fd68..fe62b966edb9 100644
--- a/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
+++ b/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/ConnectedMachine/Az.ConnectedMachine.csproj b/src/ConnectedMachine/Az.ConnectedMachine.csproj
index 266a916182fe..c5704bc1290e 100644
--- a/src/ConnectedMachine/Az.ConnectedMachine.csproj
+++ b/src/ConnectedMachine/Az.ConnectedMachine.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ConnectedNetwork/Az.ConnectedNetwork.csproj b/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
index 71b855d1a1c9..218e343acf0d 100644
--- a/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
+++ b/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ContainerInstance/Az.ContainerInstance.csproj b/src/ContainerInstance/Az.ContainerInstance.csproj
index 17d8df49d6a0..77a9a17c432a 100644
--- a/src/ContainerInstance/Az.ContainerInstance.csproj
+++ b/src/ContainerInstance/Az.ContainerInstance.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj b/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
index f65f17786e2d..e7f9a95190a5 100644
--- a/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
+++ b/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.ContainerRegistry" Version="1.0.0-preview.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/CosmosDB/CosmosDB/CosmosDB.csproj b/src/CosmosDB/CosmosDB/CosmosDB.csproj
index 7793d9804c5b..66a74eee1911 100644
--- a/src/CosmosDB/CosmosDB/CosmosDB.csproj
+++ b/src/CosmosDB/CosmosDB/CosmosDB.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>CosmosDB</PsModuleName>
@@ -10,4 +10,6 @@
     <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="3.7.0-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/CostManagement/Az.CostManagement.csproj b/src/CostManagement/Az.CostManagement.csproj
index 59a96f4ec517..818c40b3942e 100644
--- a/src/CostManagement/Az.CostManagement.csproj
+++ b/src/CostManagement/Az.CostManagement.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/CustomLocation/Az.CustomLocation.csproj b/src/CustomLocation/Az.CustomLocation.csproj
index b80a089311f1..91d760753514 100644
--- a/src/CustomLocation/Az.CustomLocation.csproj
+++ b/src/CustomLocation/Az.CustomLocation.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/CustomProviders/Az.CustomProviders.csproj b/src/CustomProviders/Az.CustomProviders.csproj
index a4c0a69aa7e3..aaaff9621393 100644
--- a/src/CustomProviders/Az.CustomProviders.csproj
+++ b/src/CustomProviders/Az.CustomProviders.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>CustomProviders</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataBox/Az.DataBox.csproj b/src/DataBox/Az.DataBox.csproj
index 672c465d173c..dce963ebca78 100644
--- a/src/DataBox/Az.DataBox.csproj
+++ b/src/DataBox/Az.DataBox.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj b/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
index d1af869e15bc..4b01a5d66b46 100644
--- a/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
+++ b/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DataBoxEdge</PsModuleName>
@@ -43,4 +43,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DataBoxEdge" Version="1.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataFactory/DataFactories/DataFactories.csproj b/src/DataFactory/DataFactories/DataFactories.csproj
index 657ac48ba1e4..82773b42697b 100644
--- a/src/DataFactory/DataFactories/DataFactories.csproj
+++ b/src/DataFactory/DataFactories/DataFactories.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DataFactory</PsModuleName>
@@ -18,4 +18,6 @@
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
index 79b5ce0d96a3..560aa557efd8 100644
--- a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
+++ b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DataFactory</PsModuleName>
@@ -16,4 +16,6 @@
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj b/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
index a722bcab93c5..4ad8d16d9821 100644
--- a/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
+++ b/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Analytics" Version="3.3.1-preview" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj b/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
index e703f804832b..4246d7155c8f 100644
--- a/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
+++ b/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DataLakeStore</PsModuleName>
@@ -18,4 +18,6 @@
     <PackageReference Include="System.Net.Requests" Version="4.3.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj b/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
index 7768538b10b9..3498062c0bde 100644
--- a/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
+++ b/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/DataMigration/DataMigration/DataMigration.csproj b/src/DataMigration/DataMigration/DataMigration.csproj
index dfa2e974e668..5052dd81fa0a 100644
--- a/src/DataMigration/DataMigration/DataMigration.csproj
+++ b/src/DataMigration/DataMigration/DataMigration.csproj
@@ -25,4 +25,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DataProtection/Az.DataProtection.csproj b/src/DataProtection/Az.DataProtection.csproj
index bac92f993c43..305d67d2128b 100644
--- a/src/DataProtection/Az.DataProtection.csproj
+++ b/src/DataProtection/Az.DataProtection.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/DataShare/DataShare/DataShare.csproj b/src/DataShare/DataShare/DataShare.csproj
index 07b0114d2567..970fa42976ae 100644
--- a/src/DataShare/DataShare/DataShare.csproj
+++ b/src/DataShare/DataShare/DataShare.csproj
@@ -25,4 +25,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Databricks/Az.Databricks.csproj b/src/Databricks/Az.Databricks.csproj
index f58f9f0c6cc9..4f16cb30b1b1 100644
--- a/src/Databricks/Az.Databricks.csproj
+++ b/src/Databricks/Az.Databricks.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>Databricks</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/Datadog/Az.Datadog.csproj b/src/Datadog/Az.Datadog.csproj
index 26f9569cc235..3280231cd5d9 100644
--- a/src/Datadog/Az.Datadog.csproj
+++ b/src/Datadog/Az.Datadog.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/DedicatedHsm/Az.DedicatedHsm.csproj b/src/DedicatedHsm/Az.DedicatedHsm.csproj
index db6842c159b8..be5ee6544658 100644
--- a/src/DedicatedHsm/Az.DedicatedHsm.csproj
+++ b/src/DedicatedHsm/Az.DedicatedHsm.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj b/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
index f4bbdeb098ba..d4c93f10da82 100644
--- a/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
+++ b/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DeploymentManager</PsModuleName>
@@ -29,4 +29,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DesktopVirtualization/Az.DesktopVirtualization.csproj b/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
index 5f0f7410a7f8..8e3a38f0513e 100644
--- a/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
+++ b/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>DesktopVirtualization</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/DevSpaces/DevSpaces/DevSpaces.csproj b/src/DevSpaces/DevSpaces/DevSpaces.csproj
index 133fd6742056..29ba89dc8f92 100644
--- a/src/DevSpaces/DevSpaces/DevSpaces.csproj
+++ b/src/DevSpaces/DevSpaces/DevSpaces.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DevSpaces" Version="0.10.0-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj b/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
index 791ef77d11ec..fb381801fe43 100644
--- a/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
+++ b/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DevTestLabs" Version="2.0.2" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
index c35fae49ac5b..f0e8e4d8dfa8 100644
--- a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
+++ b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DeviceProvisioningServices</PsModuleName>
@@ -19,4 +19,6 @@
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DigitalTwins/Az.DigitalTwins.csproj b/src/DigitalTwins/Az.DigitalTwins.csproj
index 67cfc9ba9caf..abb2593577b5 100644
--- a/src/DigitalTwins/Az.DigitalTwins.csproj
+++ b/src/DigitalTwins/Az.DigitalTwins.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/DiskPool/Az.DiskPool.csproj b/src/DiskPool/Az.DiskPool.csproj
index 53d1b069b022..a67dfd7e2397 100644
--- a/src/DiskPool/Az.DiskPool.csproj
+++ b/src/DiskPool/Az.DiskPool.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Dns/Dns/Dns.csproj b/src/Dns/Dns/Dns.csproj
index 4268a8acc368..1e599873de3c 100644
--- a/src/Dns/Dns/Dns.csproj
+++ b/src/Dns/Dns/Dns.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/DnsResolver/Az.DnsResolver.csproj b/src/DnsResolver/Az.DnsResolver.csproj
index 28e81c26f43d..b38f5fa3ab4b 100644
--- a/src/DnsResolver/Az.DnsResolver.csproj
+++ b/src/DnsResolver/Az.DnsResolver.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/EdgeOrder/Az.EdgeOrder.csproj b/src/EdgeOrder/Az.EdgeOrder.csproj
index 3675661eada6..4c868e0a370a 100644
--- a/src/EdgeOrder/Az.EdgeOrder.csproj
+++ b/src/EdgeOrder/Az.EdgeOrder.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Elastic/Az.Elastic.csproj b/src/Elastic/Az.Elastic.csproj
index b94b2842454b..a38d01fcd402 100644
--- a/src/Elastic/Az.Elastic.csproj
+++ b/src/Elastic/Az.Elastic.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/EventGrid/EventGrid/EventGrid.csproj b/src/EventGrid/EventGrid/EventGrid.csproj
index 11d08a17ad08..cd9bed9937a6 100644
--- a/src/EventGrid/EventGrid/EventGrid.csproj
+++ b/src/EventGrid/EventGrid/EventGrid.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>EventGrid</PsModuleName>
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="7.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/EventHub/EventHub/EventHub.csproj b/src/EventHub/EventHub/EventHub.csproj
index 382da4925f1c..81bce5a69996 100644
--- a/src/EventHub/EventHub/EventHub.csproj
+++ b/src/EventHub/EventHub/EventHub.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>EventHub</PsModuleName>
@@ -19,4 +19,6 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="5.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/FrontDoor/FrontDoor/FrontDoor.csproj b/src/FrontDoor/FrontDoor/FrontDoor.csproj
index 13891cd57e01..9bd1d9de1b06 100644
--- a/src/FrontDoor/FrontDoor/FrontDoor.csproj
+++ b/src/FrontDoor/FrontDoor/FrontDoor.csproj
@@ -29,4 +29,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Functions/Az.Functions.csproj b/src/Functions/Az.Functions.csproj
index 75a69ac5a642..dbb3990441db 100644
--- a/src/Functions/Az.Functions.csproj
+++ b/src/Functions/Az.Functions.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>Functions</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/GuestConfiguration/Az.GuestConfiguration.csproj b/src/GuestConfiguration/Az.GuestConfiguration.csproj
index a49e24bc5ab9..5eefea354f1f 100644
--- a/src/GuestConfiguration/Az.GuestConfiguration.csproj
+++ b/src/GuestConfiguration/Az.GuestConfiguration.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/HDInsight/HDInsight/HDInsight.csproj b/src/HDInsight/HDInsight/HDInsight.csproj
index 6a0610a6bf59..e189d09d960c 100644
--- a/src/HDInsight/HDInsight/HDInsight.csproj
+++ b/src/HDInsight/HDInsight/HDInsight.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>HDInsight</PsModuleName>
@@ -16,4 +16,6 @@
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/HPCCache/HPCCache/HPCCache.csproj b/src/HPCCache/HPCCache/HPCCache.csproj
index db710dbff532..013300924934 100644
--- a/src/HPCCache/HPCCache/HPCCache.csproj
+++ b/src/HPCCache/HPCCache/HPCCache.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>HPCCache</PsModuleName>
@@ -29,4 +29,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/HanaOnAzure/Az.HanaOnAzure.csproj b/src/HanaOnAzure/Az.HanaOnAzure.csproj
index 99877a72a96a..613e03996155 100644
--- a/src/HanaOnAzure/Az.HanaOnAzure.csproj
+++ b/src/HanaOnAzure/Az.HanaOnAzure.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>HanaOnAzure</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/HealthBot/Az.HealthBot.csproj b/src/HealthBot/Az.HealthBot.csproj
index 0f9b6f6bf8b8..b9d691045c95 100644
--- a/src/HealthBot/Az.HealthBot.csproj
+++ b/src/HealthBot/Az.HealthBot.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/HealthcareApis/Az.HealthcareApis.csproj b/src/HealthcareApis/Az.HealthcareApis.csproj
index e5034c6fba8e..32255d50b7ba 100644
--- a/src/HealthcareApis/Az.HealthcareApis.csproj
+++ b/src/HealthcareApis/Az.HealthcareApis.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ImageBuilder/Az.ImageBuilder.csproj b/src/ImageBuilder/Az.ImageBuilder.csproj
index 3d00aec80be9..6ff273a160b7 100644
--- a/src/ImageBuilder/Az.ImageBuilder.csproj
+++ b/src/ImageBuilder/Az.ImageBuilder.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>ImageBuilder</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/ImportExport/Az.ImportExport.csproj b/src/ImportExport/Az.ImportExport.csproj
index f5bf9116e65f..bed515da3dc3 100644
--- a/src/ImportExport/Az.ImportExport.csproj
+++ b/src/ImportExport/Az.ImportExport.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>ImportExport</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/IotCentral/IotCentral/IotCentral.csproj b/src/IotCentral/IotCentral/IotCentral.csproj
index 3db332fddb11..2b7845b16162 100644
--- a/src/IotCentral/IotCentral/IotCentral.csproj
+++ b/src/IotCentral/IotCentral/IotCentral.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>IotCentral</PsModuleName>
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.IotCentral" Version="4.0.0" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/IotHub/IotHub/IotHub.csproj b/src/IotHub/IotHub/IotHub.csproj
index 7216c99b01c7..186e50e70614 100644
--- a/src/IotHub/IotHub/IotHub.csproj
+++ b/src/IotHub/IotHub/IotHub.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>IotHub</PsModuleName>
@@ -21,4 +21,6 @@
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/KeyVault/KeyVault/KeyVault.csproj b/src/KeyVault/KeyVault/KeyVault.csproj
index ad0b036683a4..7b5e28816669 100644
--- a/src/KeyVault/KeyVault/KeyVault.csproj
+++ b/src/KeyVault/KeyVault/KeyVault.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>KeyVault</PsModuleName>
@@ -37,4 +37,6 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj b/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
index e02730bca5f4..095293867736 100644
--- a/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
+++ b/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/Kusto/Az.Kusto.csproj b/src/Kusto/Az.Kusto.csproj
index 785d1ede5822..c3f1a4363c17 100644
--- a/src/Kusto/Az.Kusto.csproj
+++ b/src/Kusto/Az.Kusto.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/LabServices/Az.LabServices.csproj b/src/LabServices/Az.LabServices.csproj
index 8c9b11e2107e..6a273bbd155d 100644
--- a/src/LabServices/Az.LabServices.csproj
+++ b/src/LabServices/Az.LabServices.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/LogicApp/LogicApp/LogicApp.csproj b/src/LogicApp/LogicApp/LogicApp.csproj
index 3a40ae58c627..7a891ba850c8 100644
--- a/src/LogicApp/LogicApp/LogicApp.csproj
+++ b/src/LogicApp/LogicApp/LogicApp.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Logic" Version="4.1.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Logz/Az.Logz.csproj b/src/Logz/Az.Logz.csproj
index 68cb24e8af32..2f66d86ffe83 100644
--- a/src/Logz/Az.Logz.csproj
+++ b/src/Logz/Az.Logz.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/MachineLearning/MachineLearning/MachineLearning.csproj b/src/MachineLearning/MachineLearning/MachineLearning.csproj
index 7b3929d23f72..cd118ef4bbc2 100644
--- a/src/MachineLearning/MachineLearning/MachineLearning.csproj
+++ b/src/MachineLearning/MachineLearning/MachineLearning.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.MachineLearning" Version="1.0.1" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Maintenance/Maintenance/Maintenance.csproj b/src/Maintenance/Maintenance/Maintenance.csproj
index 4b07044ed6d6..98bdec3957f1 100644
--- a/src/Maintenance/Maintenance/Maintenance.csproj
+++ b/src/Maintenance/Maintenance/Maintenance.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Maintenance</PsModuleName>
@@ -19,4 +19,6 @@
     <Folder Include="help\" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj b/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
index 953321a6d602..0244d18359d4 100644
--- a/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
+++ b/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ManagedServices/Az.ManagedServices.csproj b/src/ManagedServices/Az.ManagedServices.csproj
index cf7d26169315..b699ca517ad5 100644
--- a/src/ManagedServices/Az.ManagedServices.csproj
+++ b/src/ManagedServices/Az.ManagedServices.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj b/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
index 95e0d5910fd1..ccc0468b7342 100644
--- a/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
+++ b/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ManagementPartner" Version="1.1.1-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Maps/Az.Maps.csproj b/src/Maps/Az.Maps.csproj
index 6a22840ff288..5a505d94c167 100644
--- a/src/Maps/Az.Maps.csproj
+++ b/src/Maps/Az.Maps.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/MariaDb/Az.MariaDb.csproj b/src/MariaDb/Az.MariaDb.csproj
index d627a486ca2b..9e80fd5058e4 100644
--- a/src/MariaDb/Az.MariaDb.csproj
+++ b/src/MariaDb/Az.MariaDb.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj b/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
index fcfe82b4966a..1f8f8846d4b3 100644
--- a/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
+++ b/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Marketplace/Marketplace/Marketplace.csproj b/src/Marketplace/Marketplace/Marketplace.csproj
index 5d2e17e277c2..de6fadf67f5d 100644
--- a/src/Marketplace/Marketplace/Marketplace.csproj
+++ b/src/Marketplace/Marketplace/Marketplace.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Marketplace</PsModuleName>
@@ -24,4 +24,6 @@
     <StartupObject />
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj b/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
index b6ce1fc817ce..73ae07fc5578 100644
--- a/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
+++ b/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.MarketplaceOrdering" Version="1.0.1" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Media/Media/Media.csproj b/src/Media/Media/Media.csproj
index 9b03fea76c4b..053e911150b1 100644
--- a/src/Media/Media/Media.csproj
+++ b/src/Media/Media/Media.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="0.1.1" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Migrate/Az.Migrate.csproj b/src/Migrate/Az.Migrate.csproj
index 0c08ff47abb8..f2dfbad224c2 100644
--- a/src/Migrate/Az.Migrate.csproj
+++ b/src/Migrate/Az.Migrate.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/MixedReality/MixedReality/MixedReality.csproj b/src/MixedReality/MixedReality/MixedReality.csproj
index ab4e806ec4b9..10b4b948ee40 100644
--- a/src/MixedReality/MixedReality/MixedReality.csproj
+++ b/src/MixedReality/MixedReality/MixedReality.csproj
@@ -10,4 +10,6 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Monitor/Monitor/Monitor.csproj b/src/Monitor/Monitor/Monitor.csproj
index adbe579cf437..dba7065a0202 100644
--- a/src/Monitor/Monitor/Monitor.csproj
+++ b/src/Monitor/Monitor/Monitor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Monitor</PsModuleName>
@@ -15,4 +15,6 @@
     <PackageReference Include="AutoMapper" Version="6.2.2" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/MonitoringSolutions/Az.MonitoringSolutions.csproj b/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
index 0dfa9a7586b4..f90b5768a4b6 100644
--- a/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
+++ b/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>MonitoringSolutions</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/MySql/Az.MySql.csproj b/src/MySql/Az.MySql.csproj
index 660d719f49cc..a26ed5e475d8 100644
--- a/src/MySql/Az.MySql.csproj
+++ b/src/MySql/Az.MySql.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj b/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
index 8bd0f3d35b86..09aed022aa6c 100644
--- a/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
+++ b/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
@@ -39,4 +39,6 @@
     </EmbeddedResource>
   </ItemGroup>
  
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj
index 53f4bd6d3151..d5d895d5c482 100644
--- a/src/Network/Network/Network.csproj
+++ b/src/Network/Network/Network.csproj
@@ -41,4 +41,6 @@
     <Folder Include="RouteServerPeer\" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj b/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
index 9e9324a0a5d1..967a3295cc4d 100644
--- a/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
+++ b/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.NotificationHubs" Version="2.3.2-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj b/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
index bfc83bbfe6c3..2c58a9d118f6 100644
--- a/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
+++ b/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>OperationalInsights</PsModuleName>
@@ -30,4 +30,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Peering/Peering/Peering.csproj b/src/Peering/Peering/Peering.csproj
index a3beb5841911..273b3ee89d0f 100644
--- a/src/Peering/Peering/Peering.csproj
+++ b/src/Peering/Peering/Peering.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Peering</PsModuleName>
@@ -29,4 +29,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj b/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
index 359ac52d0eca..ea438a34a911 100644
--- a/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
+++ b/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
@@ -20,4 +20,6 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Portal/Az.Portal.csproj b/src/Portal/Az.Portal.csproj
index 43f1b9b484e0..45fde81f85bf 100644
--- a/src/Portal/Az.Portal.csproj
+++ b/src/Portal/Az.Portal.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>Portal</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/PostgreSql/Az.PostgreSql.csproj b/src/PostgreSql/Az.PostgreSql.csproj
index 25bff109937b..afc21b742157 100644
--- a/src/PostgreSql/Az.PostgreSql.csproj
+++ b/src/PostgreSql/Az.PostgreSql.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/PowerBIEmbedded/PowerBI/PowerBI.csproj b/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
index 8d6f73718a8f..cbf981742ff8 100644
--- a/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
+++ b/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
@@ -20,4 +20,6 @@
     <ProjectReference Include="..\PowerBIEmbedded\PowerBIEmbedded.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj b/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
index 67126f8664de..be17193bd552 100644
--- a/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
+++ b/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.PowerBIEmbedded" Version="1.1.1-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/PrivateDns/PrivateDns/PrivateDns.csproj b/src/PrivateDns/PrivateDns/PrivateDns.csproj
index a64c79893aec..59d60237bfc1 100644
--- a/src/PrivateDns/PrivateDns/PrivateDns.csproj
+++ b/src/PrivateDns/PrivateDns/PrivateDns.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>PrivateDns</PsModuleName>
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ProviderHub/Az.ProviderHub.csproj b/src/ProviderHub/Az.ProviderHub.csproj
index 3de9aeb2921a..5d8ffa0fd343 100644
--- a/src/ProviderHub/Az.ProviderHub.csproj
+++ b/src/ProviderHub/Az.ProviderHub.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Purview/Purview.Autorest/Az.Purview.csproj b/src/Purview/Purview.Autorest/Az.Purview.csproj
index e0ff393095d8..a2ff50f38601 100644
--- a/src/Purview/Purview.Autorest/Az.Purview.csproj
+++ b/src/Purview/Purview.Autorest/Az.Purview.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Purview/Purview/Purview.csproj b/src/Purview/Purview/Purview.csproj
index f0687a335e3e..8fd84ff3059f 100644
--- a/src/Purview/Purview/Purview.csproj
+++ b/src/Purview/Purview/Purview.csproj
@@ -23,4 +23,6 @@
     <None Update="help\*.md" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj b/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
index d4669f669e0d..1ee809f5d934 100644
--- a/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
+++ b/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Quota/Az.Quota.csproj b/src/Quota/Az.Quota.csproj
index e0e35d5713a3..7fc55c7dd0ba 100644
--- a/src/Quota/Az.Quota.csproj
+++ b/src/Quota/Az.Quota.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj b/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj
index 5529d8c8fb4d..0d03ddb5a9e4 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj
@@ -21,4 +21,6 @@
 		<ProjectReference Include="..\RecoveryServices.Backup.Models\RecoveryServices.Backup.Models.csproj" />
 	</ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj b/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj
index 4cc1c2f0716c..b114b024b0f1 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj
@@ -11,4 +11,6 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName).Backup</RootNamespace>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
index 920bd2da7f1a..2adc4de166bb 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -21,4 +21,6 @@
     </Compile>
   </ItemGroup>
   
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj b/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj
index bb55417c6d66..4958059e0f19 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -19,4 +19,6 @@
     <ProjectReference Include="..\RecoveryServices.Backup.ServiceClientAdapter\RecoveryServices.Backup.ServiceClientAdapter.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj b/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj
index 5d184e592895..7a29cc564bcb 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -22,4 +22,6 @@
     <ProjectReference Include="..\RecoveryServices.Backup.Helpers\RecoveryServices.Backup.Helpers.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj b/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
index 8dd14ecbe531..4135c0028670 100644
--- a/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -24,4 +24,6 @@
     <ProjectReference Include="..\RecoveryServices.Backup.ServiceClientAdapter\RecoveryServices.Backup.ServiceClientAdapter.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
index 6562ca496673..35d6343f0a59 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -36,4 +36,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj b/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
index df685a88f3f9..8973509b415d 100644
--- a/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
+++ b/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -31,4 +31,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RedisCache/RedisCache/RedisCache.csproj b/src/RedisCache/RedisCache/RedisCache.csproj
index 613cc7dc0210..97ac7fbaedda 100644
--- a/src/RedisCache/RedisCache/RedisCache.csproj
+++ b/src/RedisCache/RedisCache/RedisCache.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RedisCache</PsModuleName>
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Redis" Version="8.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj b/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
index dca33b7b3993..84cf175d9bf9 100644
--- a/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
+++ b/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Relay/Relay/Relay.csproj b/src/Relay/Relay/Relay.csproj
index 3bc94b385fc5..8ac0c14a4d4a 100644
--- a/src/Relay/Relay/Relay.csproj
+++ b/src/Relay/Relay/Relay.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Reservations/Reservations/Reservations.csproj b/src/Reservations/Reservations/Reservations.csproj
index 03d1479780de..ffd93c4d6c38 100644
--- a/src/Reservations/Reservations/Reservations.csproj
+++ b/src/Reservations/Reservations/Reservations.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Reservations" Version="1.13.0-preview" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj b/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
index a0149b2962a9..a7d68248bb03 100644
--- a/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
+++ b/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj b/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
index dbc2d73a6457..fa5fa3e14e15 100644
--- a/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
+++ b/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>ResourceGraph</PsModuleName>
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ResourceGraph" Version="2.1.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ResourceMover/Az.ResourceMover.csproj b/src/ResourceMover/Az.ResourceMover.csproj
index feaa0653b3f0..2686a372652d 100644
--- a/src/ResourceMover/Az.ResourceMover.csproj
+++ b/src/ResourceMover/Az.ResourceMover.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Resources/Authorization.Autorest/Az.Authorization.csproj b/src/Resources/Authorization.Autorest/Az.Authorization.csproj
index ddb564885335..50d6109d733b 100644
--- a/src/Resources/Authorization.Autorest/Az.Authorization.csproj
+++ b/src/Resources/Authorization.Autorest/Az.Authorization.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj b/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
index f8ad4315bd19..6c1ee078717b 100644
--- a/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
+++ b/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
index 8375c8dbec2d..db5a42d6e3d2 100644
--- a/src/Resources/ResourceManager/ResourceManager.csproj
+++ b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Resources</PsModuleName>
@@ -37,4 +37,6 @@
     <None Update="ResourceManagerStartup.ps1" CopyToOutputDirectory="Never" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Resources/Resources/Resources.csproj b/src/Resources/Resources/Resources.csproj
index 40d7ac55c598..e6962e83e0b0 100644
--- a/src/Resources/Resources/Resources.csproj
+++ b/src/Resources/Resources/Resources.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Resources</PsModuleName>
@@ -40,4 +40,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Resources/Tags/Tags.csproj b/src/Resources/Tags/Tags.csproj
index 81c836176ea7..ebf83e73dfeb 100644
--- a/src/Resources/Tags/Tags.csproj
+++ b/src/Resources/Tags/Tags.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Resources</PsModuleName>
@@ -15,4 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
   </ItemGroup>  
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Search/Search/Search.csproj b/src/Search/Search/Search.csproj
index 4ee0abd31209..d7a5b0ad1f05 100644
--- a/src/Search/Search/Search.csproj
+++ b/src/Search/Search/Search.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Search</PsModuleName>
@@ -20,4 +20,6 @@
     </Compile>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Security/Security/Security.csproj b/src/Security/Security/Security.csproj
index fa8c6b4b6441..e6a4e85b8f92 100644
--- a/src/Security/Security/Security.csproj
+++ b/src/Security/Security/Security.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Security</PsModuleName>
@@ -29,4 +29,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj b/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
index 03254f0846f3..02ff36a6ffee 100644
--- a/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
+++ b/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
@@ -10,4 +10,6 @@
     <PackageReference Include="Microsoft.Azure.Management.SecurityInsights" Version="1.0.0" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/ServiceBus/ServiceBus/ServiceBus.csproj b/src/ServiceBus/ServiceBus/ServiceBus.csproj
index b5beaf2e2f59..1c53c2dcad7d 100644
--- a/src/ServiceBus/ServiceBus/ServiceBus.csproj
+++ b/src/ServiceBus/ServiceBus/ServiceBus.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>ServiceBus</PsModuleName>
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj b/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
index 92fb4f2a8654..10f4a867e669 100644
--- a/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
+++ b/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>ServiceFabric</PsModuleName>
@@ -36,4 +36,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/ServiceLinker/Az.ServiceLinker.csproj b/src/ServiceLinker/Az.ServiceLinker.csproj
index 722e6e7a6865..dfbcd01505a0 100644
--- a/src/ServiceLinker/Az.ServiceLinker.csproj
+++ b/src/ServiceLinker/Az.ServiceLinker.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/SignalR/SignalR.Autorest/Az.SignalR.csproj b/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
index 3e6ad0fa4c28..646abeec2740 100644
--- a/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
+++ b/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/SignalR/SignalR/SignalR.csproj b/src/SignalR/SignalR/SignalR.csproj
index 52c389fc470e..d0a8e0d75efb 100644
--- a/src/SignalR/SignalR/SignalR.csproj
+++ b/src/SignalR/SignalR/SignalR.csproj
@@ -25,4 +25,6 @@
 
 
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/SpringCloud/Az.SpringCloud.csproj b/src/SpringCloud/Az.SpringCloud.csproj
index 06904d1cfcfc..2a176229e438 100644
--- a/src/SpringCloud/Az.SpringCloud.csproj
+++ b/src/SpringCloud/Az.SpringCloud.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
index 601cd9349926..285ad0f87be7 100644
--- a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
+++ b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
@@ -16,4 +16,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" PrivateAssets="all" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Sql/Sql/Sql.csproj b/src/Sql/Sql/Sql.csproj
index 935166c011a7..fa1c6fc5f141 100644
--- a/src/Sql/Sql/Sql.csproj
+++ b/src/Sql/Sql/Sql.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Sql</PsModuleName>
@@ -43,4 +43,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj b/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
index 2620ec05397c..da14a39c4e2b 100644
--- a/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
+++ b/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>SqlVirtualMachine</PsModuleName>
@@ -18,4 +18,6 @@
     <Folder Include="help\" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/StackHCI/Az.StackHCI.csproj b/src/StackHCI/Az.StackHCI.csproj
index 62cd74bcd761..cddb19839e2a 100644
--- a/src/StackHCI/Az.StackHCI.csproj
+++ b/src/StackHCI/Az.StackHCI.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>StackHCI</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/Storage/Storage.Management/Storage.Management.csproj b/src/Storage/Storage.Management/Storage.Management.csproj
index c938fa96f3ba..b3b47054be10 100644
--- a/src/Storage/Storage.Management/Storage.Management.csproj
+++ b/src/Storage/Storage.Management/Storage.Management.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <PsModuleName>Storage</PsModuleName>
     <OmitJsonPackage>true</OmitJsonPackage>
@@ -24,4 +24,6 @@
     <Compile Include="$(StorageToolsPath)Adapters\ARM.Storage.6\ARMStorageProvider.cs" Link="Common\ARMStorageProvider.cs" />
     <Compile Include="$(StorageToolsPath)Adapters\ARM.Storage.6\ARMStorageService.cs" Link="Common\ARMStorageService.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Storage/Storage/Storage.csproj b/src/Storage/Storage/Storage.csproj
index 40dcb9c26faa..6c0923087896 100644
--- a/src/Storage/Storage/Storage.csproj
+++ b/src/Storage/Storage/Storage.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Storage</PsModuleName>
@@ -32,4 +32,6 @@
       <HintPath>$(RepoSrc)lib\Microsoft.Azure.Storage.DataMovement.dll</HintPath>
     </Reference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/StorageSync/StorageSync/StorageSync.csproj b/src/StorageSync/StorageSync/StorageSync.csproj
index f52b0ddbde42..b257b15de136 100644
--- a/src/StorageSync/StorageSync/StorageSync.csproj
+++ b/src/StorageSync/StorageSync/StorageSync.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>StorageSync</PsModuleName>
@@ -51,4 +51,6 @@
 
 
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/StreamAnalytics/Az.StreamAnalytics.csproj b/src/StreamAnalytics/Az.StreamAnalytics.csproj
index 8b45e1680683..247a5a7b340d 100644
--- a/src/StreamAnalytics/Az.StreamAnalytics.csproj
+++ b/src/StreamAnalytics/Az.StreamAnalytics.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Subscription/Subscription/Subscription.csproj b/src/Subscription/Subscription/Subscription.csproj
index 9dfb7bfde93a..de66e8637684 100644
--- a/src/Subscription/Subscription/Subscription.csproj
+++ b/src/Subscription/Subscription/Subscription.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Subscription" Version="2.0.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Support/Support/Support.csproj b/src/Support/Support/Support.csproj
index c7ce2d7ce8aa..02932f8abf3d 100644
--- a/src/Support/Support/Support.csproj
+++ b/src/Support/Support/Support.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Support</PsModuleName>
@@ -11,4 +11,6 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Synapse/Synapse.Autorest/Az.Synapse.csproj b/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
index d6fbeddaffb9..7992b0cef81a 100644
--- a/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
+++ b/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Synapse/Synapse/Synapse.csproj b/src/Synapse/Synapse/Synapse.csproj
index a7c35b40f7ed..c215cdc3158b 100644
--- a/src/Synapse/Synapse/Synapse.csproj
+++ b/src/Synapse/Synapse/Synapse.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Synapse</PsModuleName>
@@ -43,4 +43,6 @@
     <EmbeddedResource Include="Models\ManagementModels\AdvancedThreatProtection\Templates\DeployWorkspaceVaTemplate.json" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj b/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
index efcc3a4908a4..d1f1e4926863 100644
--- a/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
+++ b/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PsModuleName>TimeSeriesInsights</PsModuleName>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
+</Project>
diff --git a/src/TrafficManager/TrafficManager/TrafficManager.csproj b/src/TrafficManager/TrafficManager/TrafficManager.csproj
index 09f246d48289..0e526d32be47 100644
--- a/src/TrafficManager/TrafficManager/TrafficManager.csproj
+++ b/src/TrafficManager/TrafficManager/TrafficManager.csproj
@@ -14,4 +14,6 @@
     <PackageReference Include="Microsoft.Azure.Management.TrafficManager" Version="2.5.4" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/VMware/Az.VMware.csproj b/src/VMware/Az.VMware.csproj
index cf83c84cbd28..fa1604947a18 100644
--- a/src/VMware/Az.VMware.csproj
+++ b/src/VMware/Az.VMware.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/src/Websites/Websites.Autorest/Az.Websites.csproj b/src/Websites/Websites.Autorest/Az.Websites.csproj
index 96bfda0ef098..6ec5a395222d 100644
--- a/src/Websites/Websites.Autorest/Az.Websites.csproj
+++ b/src/Websites/Websites.Autorest/Az.Websites.csproj
@@ -5,4 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/Websites/Websites.Helper/Websites.Helper.csproj b/src/Websites/Websites.Helper/Websites.Helper.csproj
index 0377a5f481aa..99b25d4160db 100644
--- a/src/Websites/Websites.Helper/Websites.Helper.csproj
+++ b/src/Websites/Websites.Helper/Websites.Helper.csproj
@@ -16,4 +16,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
diff --git a/src/Websites/Websites/Websites.csproj b/src/Websites/Websites/Websites.csproj
index 3166a4299f24..dff134e70c60 100644
--- a/src/Websites/Websites/Websites.csproj
+++ b/src/Websites/Websites/Websites.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Websites</PsModuleName>
@@ -39,4 +39,6 @@
     <None Update="WebsitesStartup.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
+</Project>
diff --git a/src/WindowsIotServices/Az.WindowsIotServices.csproj b/src/WindowsIotServices/Az.WindowsIotServices.csproj
index 64e6613eeb47..262512f06762 100644
--- a/src/WindowsIotServices/Az.WindowsIotServices.csproj
+++ b/src/WindowsIotServices/Az.WindowsIotServices.csproj
@@ -4,4 +4,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.Post.props" />
+
 </Project>
diff --git a/tools/Gen2Master/Templates/Az.ModuleName.csproj b/tools/Gen2Master/Templates/Az.ModuleName.csproj
index da1cff825c22..c7677b851c16 100644
--- a/tools/Gen2Master/Templates/Az.ModuleName.csproj
+++ b/tools/Gen2Master/Templates/Az.ModuleName.csproj
@@ -4,4 +4,5 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
\ No newline at end of file
diff --git a/tools/Gen2Master/Templates/Az.ModuleName.hybrid.csproj b/tools/Gen2Master/Templates/Az.ModuleName.hybrid.csproj
index 6d7909506555..692527c333b7 100644
--- a/tools/Gen2Master/Templates/Az.ModuleName.hybrid.csproj
+++ b/tools/Gen2Master/Templates/Az.ModuleName.hybrid.csproj
@@ -6,4 +6,5 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
\ No newline at end of file
diff --git a/tools/Gen2Master/Templates/HandcraftedModule.csproj b/tools/Gen2Master/Templates/HandcraftedModule.csproj
index b34ae9c6ea49..aec69b12a9a2 100644
--- a/tools/Gen2Master/Templates/HandcraftedModule.csproj
+++ b/tools/Gen2Master/Templates/HandcraftedModule.csproj
@@ -23,4 +23,6 @@
     <None Update="help\*.md" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Post.props" />
+
 </Project>
\ No newline at end of file