diff --git a/build.proj b/build.proj
index e6fbd48a5c4f..59fa5cbaa76d 100644
--- a/build.proj
+++ b/build.proj
@@ -191,7 +191,8 @@
build
publish
-
+
+
diff --git a/src/ADDomainServices/Az.ADDomainServices.csproj b/src/ADDomainServices/Az.ADDomainServices.csproj
index 92aef5ebc61f..2ff258b814a0 100644
--- a/src/ADDomainServices/Az.ADDomainServices.csproj
+++ b/src/ADDomainServices/Az.ADDomainServices.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Accounts/Accounts/Accounts.csproj b/src/Accounts/Accounts/Accounts.csproj
index a9e7a81f1f0f..40e56842168c 100644
--- a/src/Accounts/Accounts/Accounts.csproj
+++ b/src/Accounts/Accounts/Accounts.csproj
@@ -1,4 +1,4 @@
-
+
Accounts
@@ -64,4 +64,6 @@
+
+
diff --git a/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj b/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
index 7e55005a3a25..3a3e9e23ca80 100644
--- a/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
+++ b/src/Accounts/Authentication.ResourceManager/Authentication.ResourceManager.csproj
@@ -1,4 +1,4 @@
-
+
Accounts
@@ -30,4 +30,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Accounts/Authentication/Authentication.csproj b/src/Accounts/Authentication/Authentication.csproj
index 5faf000780ec..26dfb45ecf74 100644
--- a/src/Accounts/Authentication/Authentication.csproj
+++ b/src/Accounts/Authentication/Authentication.csproj
@@ -1,4 +1,4 @@
-
+
Accounts
@@ -30,4 +30,6 @@
+
+
diff --git a/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj b/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
index 1fc7884c59f0..7612f5736bb2 100644
--- a/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
+++ b/src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj
@@ -1,4 +1,4 @@
-
+
Accounts
@@ -22,4 +22,6 @@
$(RepoSrc)MSSharedLibKey.snk
TRACE;RELEASE;SIGN
-
\ No newline at end of file
+
+
+
diff --git a/src/Accounts/Authenticators/Authenticators.csproj b/src/Accounts/Authenticators/Authenticators.csproj
index e06960b0baf1..7328930ca37d 100644
--- a/src/Accounts/Authenticators/Authenticators.csproj
+++ b/src/Accounts/Authenticators/Authenticators.csproj
@@ -37,4 +37,6 @@
+
+
diff --git a/src/Advisor/Advisor/Advisor.csproj b/src/Advisor/Advisor/Advisor.csproj
index f77273a6182f..1e9eb52fc35b 100644
--- a/src/Advisor/Advisor/Advisor.csproj
+++ b/src/Advisor/Advisor/Advisor.csproj
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Aks/Aks.Autorest/Az.Aks.csproj b/src/Aks/Aks.Autorest/Az.Aks.csproj
index 99f6d0b0980a..515a1a4e17c7 100644
--- a/src/Aks/Aks.Autorest/Az.Aks.csproj
+++ b/src/Aks/Aks.Autorest/Az.Aks.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Aks/Aks/Aks.csproj b/src/Aks/Aks/Aks.csproj
index a74ef2f4693b..cabbd70ddea9 100644
--- a/src/Aks/Aks/Aks.csproj
+++ b/src/Aks/Aks/Aks.csproj
@@ -1,4 +1,4 @@
-
+
Aks
@@ -32,4 +32,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj b/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
index 368fc658e6a2..1078f22bf360 100644
--- a/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
+++ b/src/AlertsManagement/AlertsManagement/AlertsManagement.csproj
@@ -25,4 +25,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj b/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
index ff245be69e55..acba3bf7c8ea 100644
--- a/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
+++ b/src/AnalysisServices/AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
@@ -1,4 +1,4 @@
-
+
AnalysisServices
@@ -10,4 +10,6 @@
$(AzAssemblyPrefix)$(PsModuleName).Dataplane
$(LegacyAssemblyPrefix)$(PsModuleName).Dataplane
-
\ No newline at end of file
+
+
+
diff --git a/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj b/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
index 7ed720a03b06..0dccb865c616 100644
--- a/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
+++ b/src/AnalysisServices/AnalysisServices/AnalysisServices.csproj
@@ -16,4 +16,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj b/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
index 5848f450c5e2..bd528d5097ad 100644
--- a/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
+++ b/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
@@ -1,4 +1,4 @@
-
+
ApiManagement
@@ -31,4 +31,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ApiManagement/ApiManagement/ApiManagement.csproj b/src/ApiManagement/ApiManagement/ApiManagement.csproj
index 46e0652737cc..747206f9993c 100644
--- a/src/ApiManagement/ApiManagement/ApiManagement.csproj
+++ b/src/ApiManagement/ApiManagement/ApiManagement.csproj
@@ -22,4 +22,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/App/Az.App.csproj b/src/App/Az.App.csproj
index 4f0470ca103a..aaf3015ec713 100644
--- a/src/App/Az.App.csproj
+++ b/src/App/Az.App.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/AppConfiguration/Az.AppConfiguration.csproj b/src/AppConfiguration/Az.AppConfiguration.csproj
index aff60619e9be..9ab2fe354f87 100644
--- a/src/AppConfiguration/Az.AppConfiguration.csproj
+++ b/src/AppConfiguration/Az.AppConfiguration.csproj
@@ -1,7 +1,9 @@
-
+
AppConfiguration
-
\ No newline at end of file
+
+
+
diff --git a/src/ApplicationInsights/Az.ApplicationInsights.csproj b/src/ApplicationInsights/Az.ApplicationInsights.csproj
index f2a942e91447..125f4c73b42f 100644
--- a/src/ApplicationInsights/Az.ApplicationInsights.csproj
+++ b/src/ApplicationInsights/Az.ApplicationInsights.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Attestation/Attestation/Attestation.csproj b/src/Attestation/Attestation/Attestation.csproj
index 408106d673db..96a6c671ce17 100644
--- a/src/Attestation/Attestation/Attestation.csproj
+++ b/src/Attestation/Attestation/Attestation.csproj
@@ -1,4 +1,4 @@
-
+
Attestation
@@ -22,4 +22,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Automation/Automation/Automation.csproj b/src/Automation/Automation/Automation.csproj
index 26c3462ad133..dfba631b26ed 100644
--- a/src/Automation/Automation/Automation.csproj
+++ b/src/Automation/Automation/Automation.csproj
@@ -30,4 +30,6 @@
-
\ No newline at end of file
+
+
+
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 @@
+
+
+
+
+ $(NoWarn),1591
+ $(OutputPath)\$(AssemblyName).xml
+
+
+
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 @@
false
$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\bin
$(OutputPath)
+
- 1998
+ $(NoWarn);1998
+
+
+
+
+
+
+
+
+
+
+
+ $(NoWarn);1570, 1571, 1572, 1573, 1574, 1584, 1587
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 @@
false
$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\bin
$(OutputPath)
+
- 1998
+ $(NoWarn);1998
+
+
+
+
+
+
+
+
+
+
+
+ $(NoWarn);1570, 1571, 1572, 1573, 1574, 1584, 1587
diff --git a/src/BareMetal/Az.BareMetal.csproj b/src/BareMetal/Az.BareMetal.csproj
index b7d3cb06a7c0..54866b82c390 100644
--- a/src/BareMetal/Az.BareMetal.csproj
+++ b/src/BareMetal/Az.BareMetal.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Batch/Batch/Batch.csproj b/src/Batch/Batch/Batch.csproj
index 8568299f923d..8735f87440b5 100644
--- a/src/Batch/Batch/Batch.csproj
+++ b/src/Batch/Batch/Batch.csproj
@@ -1,4 +1,4 @@
-
+
Batch
@@ -23,4 +23,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Billing/Billing/Billing.csproj b/src/Billing/Billing/Billing.csproj
index 4983bbcb5776..d071144e34ea 100644
--- a/src/Billing/Billing/Billing.csproj
+++ b/src/Billing/Billing/Billing.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Billing/Consumption/Consumption.csproj b/src/Billing/Consumption/Consumption.csproj
index 07385b0f7ba4..7e9492d6fed4 100644
--- a/src/Billing/Consumption/Consumption.csproj
+++ b/src/Billing/Consumption/Consumption.csproj
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Billing/UsageAggregates/UsageAggregates.csproj b/src/Billing/UsageAggregates/UsageAggregates.csproj
index 8f5dd69a673d..e126aa4882ff 100644
--- a/src/Billing/UsageAggregates/UsageAggregates.csproj
+++ b/src/Billing/UsageAggregates/UsageAggregates.csproj
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Blueprint/Blueprint/Blueprint.csproj b/src/Blueprint/Blueprint/Blueprint.csproj
index 32c2195be337..7c58d509f158 100644
--- a/src/Blueprint/Blueprint/Blueprint.csproj
+++ b/src/Blueprint/Blueprint/Blueprint.csproj
@@ -26,4 +26,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/BotService/Az.BotService.csproj b/src/BotService/Az.BotService.csproj
index 9588d4b716df..1d5b6ebbd2fc 100644
--- a/src/BotService/Az.BotService.csproj
+++ b/src/BotService/Az.BotService.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Cdn/Az.Cdn.csproj b/src/Cdn/Az.Cdn.csproj
index 91c9b1f0e53e..b3392b45f55f 100644
--- a/src/Cdn/Az.Cdn.csproj
+++ b/src/Cdn/Az.Cdn.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ChangeAnalysis/Az.ChangeAnalysis.csproj b/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
index 4532a0e3b4c8..5c5dad409510 100644
--- a/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
+++ b/src/ChangeAnalysis/Az.ChangeAnalysis.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/CloudService/Az.CloudService.csproj b/src/CloudService/Az.CloudService.csproj
index ed08938f1b8a..036568c9c6e8 100644
--- a/src/CloudService/Az.CloudService.csproj
+++ b/src/CloudService/Az.CloudService.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj b/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
index f28fe736bf21..f0dce3fa9a1a 100644
--- a/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
+++ b/src/CognitiveServices/CognitiveServices/CognitiveServices.csproj
@@ -1,4 +1,4 @@
-
+
CognitiveServices
@@ -20,4 +20,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Communication/Az.Communication.csproj b/src/Communication/Az.Communication.csproj
index 27d1f78e73f8..9dfdfdc3bc85 100644
--- a/src/Communication/Az.Communication.csproj
+++ b/src/Communication/Az.Communication.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj b/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
index 8b048d5baf80..9d4c62b2390a 100644
--- a/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
+++ b/src/Compute/Compute.AlcWrapper/Compute.AlcWrapper.csproj
@@ -17,4 +17,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Compute/Compute.Autorest/Az.Compute.csproj b/src/Compute/Compute.Autorest/Az.Compute.csproj
index e1b83af36462..dd7aca2c0563 100644
--- a/src/Compute/Compute.Autorest/Az.Compute.csproj
+++ b/src/Compute/Compute.Autorest/Az.Compute.csproj
@@ -4,4 +4,6 @@
Compute
-
\ No newline at end of file
+
+
+
diff --git a/src/Compute/Compute.Helpers/Compute.Helpers.csproj b/src/Compute/Compute.Helpers/Compute.Helpers.csproj
index 987ca8fef007..0733e5aa3d80 100644
--- a/src/Compute/Compute.Helpers/Compute.Helpers.csproj
+++ b/src/Compute/Compute.Helpers/Compute.Helpers.csproj
@@ -1,4 +1,4 @@
-
+
Compute
@@ -10,7 +10,9 @@
netstandard2.0
Microsoft.Azure.PowerShell.Cmdlets.Compute.Helpers
Microsoft.Azure.PowerShell.Cmdlets.Compute.Helpers
- CS0108
+ $(NoWarn);CS0108
+
+
diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
index 893dc5670266..d9f97c621af1 100644
--- a/src/Compute/Compute/Compute.csproj
+++ b/src/Compute/Compute/Compute.csproj
@@ -54,4 +54,6 @@
+
+
diff --git a/src/ConfidentialLedger/Az.ConfidentialLedger.csproj b/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
index d544d1f51fe3..e2310204e52e 100644
--- a/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
+++ b/src/ConfidentialLedger/Az.ConfidentialLedger.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Confluent/Az.Confluent.csproj b/src/Confluent/Az.Confluent.csproj
index 6fbd9c205bf2..c5384d8fd6aa 100644
--- a/src/Confluent/Az.Confluent.csproj
+++ b/src/Confluent/Az.Confluent.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj b/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
index dc9d6760fd68..d12c91b7cb5d 100644
--- a/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
+++ b/src/ConnectedKubernetes/Az.ConnectedKubernetes.csproj
@@ -4,4 +4,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ConnectedMachine/Az.ConnectedMachine.csproj b/src/ConnectedMachine/Az.ConnectedMachine.csproj
index 266a916182fe..53a153fd7811 100644
--- a/src/ConnectedMachine/Az.ConnectedMachine.csproj
+++ b/src/ConnectedMachine/Az.ConnectedMachine.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ConnectedNetwork/Az.ConnectedNetwork.csproj b/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
index 71b855d1a1c9..b3f568658b00 100644
--- a/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
+++ b/src/ConnectedNetwork/Az.ConnectedNetwork.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ContainerInstance/Az.ContainerInstance.csproj b/src/ContainerInstance/Az.ContainerInstance.csproj
index 17d8df49d6a0..c5bd84d46e97 100644
--- a/src/ContainerInstance/Az.ContainerInstance.csproj
+++ b/src/ContainerInstance/Az.ContainerInstance.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj b/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
index f65f17786e2d..74350cde6831 100644
--- a/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
+++ b/src/ContainerRegistry/ContainerRegistry/ContainerRegistry.csproj
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/CosmosDB/CosmosDB/CosmosDB.csproj b/src/CosmosDB/CosmosDB/CosmosDB.csproj
index 7793d9804c5b..c1ee6b76e0d6 100644
--- a/src/CosmosDB/CosmosDB/CosmosDB.csproj
+++ b/src/CosmosDB/CosmosDB/CosmosDB.csproj
@@ -1,4 +1,4 @@
-
+
CosmosDB
@@ -10,4 +10,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/CostManagement/Az.CostManagement.csproj b/src/CostManagement/Az.CostManagement.csproj
index 59a96f4ec517..7c5979f956e0 100644
--- a/src/CostManagement/Az.CostManagement.csproj
+++ b/src/CostManagement/Az.CostManagement.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/CustomLocation/Az.CustomLocation.csproj b/src/CustomLocation/Az.CustomLocation.csproj
index b80a089311f1..80d2466eebb4 100644
--- a/src/CustomLocation/Az.CustomLocation.csproj
+++ b/src/CustomLocation/Az.CustomLocation.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/CustomProviders/Az.CustomProviders.csproj b/src/CustomProviders/Az.CustomProviders.csproj
index a4c0a69aa7e3..7846811d833c 100644
--- a/src/CustomProviders/Az.CustomProviders.csproj
+++ b/src/CustomProviders/Az.CustomProviders.csproj
@@ -1,7 +1,9 @@
-
+
CustomProviders
-
\ No newline at end of file
+
+
+
diff --git a/src/DataBox/Az.DataBox.csproj b/src/DataBox/Az.DataBox.csproj
index 672c465d173c..7855ed84cad0 100644
--- a/src/DataBox/Az.DataBox.csproj
+++ b/src/DataBox/Az.DataBox.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj b/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
index d1af869e15bc..58188a902de9 100644
--- a/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
+++ b/src/DataBoxEdge/DataBoxEdge/DataBoxEdge.csproj
@@ -1,4 +1,4 @@
-
+
DataBoxEdge
@@ -43,4 +43,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DataFactory/DataFactories/DataFactories.csproj b/src/DataFactory/DataFactories/DataFactories.csproj
index 657ac48ba1e4..c873918917aa 100644
--- a/src/DataFactory/DataFactories/DataFactories.csproj
+++ b/src/DataFactory/DataFactories/DataFactories.csproj
@@ -1,4 +1,4 @@
-
+
DataFactory
@@ -18,4 +18,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
index 79b5ce0d96a3..b2648f50e3ce 100644
--- a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
+++ b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
@@ -1,4 +1,4 @@
-
+
DataFactory
@@ -16,4 +16,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj b/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
index a722bcab93c5..ae962a61ef4c 100644
--- a/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
+++ b/src/DataLakeAnalytics/DataLakeAnalytics/DataLakeAnalytics.csproj
@@ -14,4 +14,6 @@
+
+
diff --git a/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj b/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
index e703f804832b..0f4d54b37244 100644
--- a/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
+++ b/src/DataLakeStore/DataLakeStore/DataLakeStore.csproj
@@ -1,4 +1,4 @@
-
+
DataLakeStore
@@ -18,4 +18,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj b/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
index 7768538b10b9..36513ee66dc1 100644
--- a/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
+++ b/src/DataMigration/DataMigration.Autorest/Az.DataMigration.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/DataMigration/DataMigration/DataMigration.csproj b/src/DataMigration/DataMigration/DataMigration.csproj
index dfa2e974e668..2d3243ae441a 100644
--- a/src/DataMigration/DataMigration/DataMigration.csproj
+++ b/src/DataMigration/DataMigration/DataMigration.csproj
@@ -25,4 +25,6 @@
Resources.Designer.cs
-
\ No newline at end of file
+
+
+
diff --git a/src/DataProtection/Az.DataProtection.csproj b/src/DataProtection/Az.DataProtection.csproj
index bac92f993c43..b455a4e40e84 100644
--- a/src/DataProtection/Az.DataProtection.csproj
+++ b/src/DataProtection/Az.DataProtection.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/DataShare/DataShare/DataShare.csproj b/src/DataShare/DataShare/DataShare.csproj
index 07b0114d2567..a0d9f2e7ed6b 100644
--- a/src/DataShare/DataShare/DataShare.csproj
+++ b/src/DataShare/DataShare/DataShare.csproj
@@ -25,4 +25,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Databricks/Az.Databricks.csproj b/src/Databricks/Az.Databricks.csproj
index f58f9f0c6cc9..0bf65c3f3902 100644
--- a/src/Databricks/Az.Databricks.csproj
+++ b/src/Databricks/Az.Databricks.csproj
@@ -1,7 +1,9 @@
-
+
Databricks
-
\ No newline at end of file
+
+
+
diff --git a/src/Datadog/Az.Datadog.csproj b/src/Datadog/Az.Datadog.csproj
index 26f9569cc235..a34b85714d1a 100644
--- a/src/Datadog/Az.Datadog.csproj
+++ b/src/Datadog/Az.Datadog.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/DedicatedHsm/Az.DedicatedHsm.csproj b/src/DedicatedHsm/Az.DedicatedHsm.csproj
index db6842c159b8..16b1c4db5582 100644
--- a/src/DedicatedHsm/Az.DedicatedHsm.csproj
+++ b/src/DedicatedHsm/Az.DedicatedHsm.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj b/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
index f4bbdeb098ba..75197eaccd46 100644
--- a/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
+++ b/src/DeploymentManager/DeploymentManager/DeploymentManager.csproj
@@ -1,4 +1,4 @@
-
+
DeploymentManager
@@ -29,4 +29,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DesktopVirtualization/Az.DesktopVirtualization.csproj b/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
index 5f0f7410a7f8..d7e6a0670e07 100644
--- a/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
+++ b/src/DesktopVirtualization/Az.DesktopVirtualization.csproj
@@ -1,7 +1,9 @@
-
+
DesktopVirtualization
-
\ No newline at end of file
+
+
+
diff --git a/src/DevSpaces/DevSpaces/DevSpaces.csproj b/src/DevSpaces/DevSpaces/DevSpaces.csproj
index 133fd6742056..45919edfc5a5 100644
--- a/src/DevSpaces/DevSpaces/DevSpaces.csproj
+++ b/src/DevSpaces/DevSpaces/DevSpaces.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj b/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
index 791ef77d11ec..bfc412a1bd48 100644
--- a/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
+++ b/src/DevTestLabs/DevTestLabs/DevTestLabs.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
index c35fae49ac5b..04df37b46220 100644
--- a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
+++ b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
@@ -1,4 +1,4 @@
-
+
DeviceProvisioningServices
@@ -19,4 +19,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DigitalTwins/Az.DigitalTwins.csproj b/src/DigitalTwins/Az.DigitalTwins.csproj
index 67cfc9ba9caf..ae3f6a2a70a6 100644
--- a/src/DigitalTwins/Az.DigitalTwins.csproj
+++ b/src/DigitalTwins/Az.DigitalTwins.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/DiskPool/Az.DiskPool.csproj b/src/DiskPool/Az.DiskPool.csproj
index 53d1b069b022..857c4178de00 100644
--- a/src/DiskPool/Az.DiskPool.csproj
+++ b/src/DiskPool/Az.DiskPool.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Dns/Dns/Dns.csproj b/src/Dns/Dns/Dns.csproj
index 4268a8acc368..aafb5b757d26 100644
--- a/src/Dns/Dns/Dns.csproj
+++ b/src/Dns/Dns/Dns.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/DnsResolver/Az.DnsResolver.csproj b/src/DnsResolver/Az.DnsResolver.csproj
index 28e81c26f43d..94af9461b05d 100644
--- a/src/DnsResolver/Az.DnsResolver.csproj
+++ b/src/DnsResolver/Az.DnsResolver.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/EdgeOrder/Az.EdgeOrder.csproj b/src/EdgeOrder/Az.EdgeOrder.csproj
index 3675661eada6..75449ea53731 100644
--- a/src/EdgeOrder/Az.EdgeOrder.csproj
+++ b/src/EdgeOrder/Az.EdgeOrder.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Elastic/Az.Elastic.csproj b/src/Elastic/Az.Elastic.csproj
index b94b2842454b..d13d4d806e3b 100644
--- a/src/Elastic/Az.Elastic.csproj
+++ b/src/Elastic/Az.Elastic.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/EventGrid/EventGrid/EventGrid.csproj b/src/EventGrid/EventGrid/EventGrid.csproj
index 11d08a17ad08..1bab904c5126 100644
--- a/src/EventGrid/EventGrid/EventGrid.csproj
+++ b/src/EventGrid/EventGrid/EventGrid.csproj
@@ -1,4 +1,4 @@
-
+
EventGrid
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/EventHub/EventHub/EventHub.csproj b/src/EventHub/EventHub/EventHub.csproj
index 382da4925f1c..b032d6b27433 100644
--- a/src/EventHub/EventHub/EventHub.csproj
+++ b/src/EventHub/EventHub/EventHub.csproj
@@ -1,4 +1,4 @@
-
+
EventHub
@@ -19,4 +19,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/FrontDoor/FrontDoor/FrontDoor.csproj b/src/FrontDoor/FrontDoor/FrontDoor.csproj
index 13891cd57e01..075140a73686 100644
--- a/src/FrontDoor/FrontDoor/FrontDoor.csproj
+++ b/src/FrontDoor/FrontDoor/FrontDoor.csproj
@@ -29,4 +29,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Functions/Az.Functions.csproj b/src/Functions/Az.Functions.csproj
index 75a69ac5a642..5672913689f1 100644
--- a/src/Functions/Az.Functions.csproj
+++ b/src/Functions/Az.Functions.csproj
@@ -1,7 +1,9 @@
-
+
Functions
-
\ No newline at end of file
+
+
+
diff --git a/src/GuestConfiguration/Az.GuestConfiguration.csproj b/src/GuestConfiguration/Az.GuestConfiguration.csproj
index a49e24bc5ab9..272c85c11b88 100644
--- a/src/GuestConfiguration/Az.GuestConfiguration.csproj
+++ b/src/GuestConfiguration/Az.GuestConfiguration.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/HDInsight/HDInsight/HDInsight.csproj b/src/HDInsight/HDInsight/HDInsight.csproj
index 6a0610a6bf59..cbae8c28bd2b 100644
--- a/src/HDInsight/HDInsight/HDInsight.csproj
+++ b/src/HDInsight/HDInsight/HDInsight.csproj
@@ -1,4 +1,4 @@
-
+
HDInsight
@@ -16,4 +16,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/HPCCache/HPCCache/HPCCache.csproj b/src/HPCCache/HPCCache/HPCCache.csproj
index db710dbff532..da2327859b80 100644
--- a/src/HPCCache/HPCCache/HPCCache.csproj
+++ b/src/HPCCache/HPCCache/HPCCache.csproj
@@ -1,4 +1,4 @@
-
+
HPCCache
@@ -29,4 +29,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/HanaOnAzure/Az.HanaOnAzure.csproj b/src/HanaOnAzure/Az.HanaOnAzure.csproj
index 99877a72a96a..d9181f62ca55 100644
--- a/src/HanaOnAzure/Az.HanaOnAzure.csproj
+++ b/src/HanaOnAzure/Az.HanaOnAzure.csproj
@@ -1,7 +1,9 @@
-
+
HanaOnAzure
-
\ No newline at end of file
+
+
+
diff --git a/src/HealthBot/Az.HealthBot.csproj b/src/HealthBot/Az.HealthBot.csproj
index 0f9b6f6bf8b8..f64c32eccc66 100644
--- a/src/HealthBot/Az.HealthBot.csproj
+++ b/src/HealthBot/Az.HealthBot.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/HealthcareApis/Az.HealthcareApis.csproj b/src/HealthcareApis/Az.HealthcareApis.csproj
index e5034c6fba8e..5ddfd5b434d2 100644
--- a/src/HealthcareApis/Az.HealthcareApis.csproj
+++ b/src/HealthcareApis/Az.HealthcareApis.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ImageBuilder/Az.ImageBuilder.csproj b/src/ImageBuilder/Az.ImageBuilder.csproj
index 3d00aec80be9..06c58c467791 100644
--- a/src/ImageBuilder/Az.ImageBuilder.csproj
+++ b/src/ImageBuilder/Az.ImageBuilder.csproj
@@ -1,7 +1,9 @@
-
+
ImageBuilder
-
\ No newline at end of file
+
+
+
diff --git a/src/ImportExport/Az.ImportExport.csproj b/src/ImportExport/Az.ImportExport.csproj
index f5bf9116e65f..e3033d23ee95 100644
--- a/src/ImportExport/Az.ImportExport.csproj
+++ b/src/ImportExport/Az.ImportExport.csproj
@@ -1,7 +1,9 @@
-
+
ImportExport
-
\ No newline at end of file
+
+
+
diff --git a/src/IotCentral/IotCentral/IotCentral.csproj b/src/IotCentral/IotCentral/IotCentral.csproj
index 3db332fddb11..d2095a1ebd76 100644
--- a/src/IotCentral/IotCentral/IotCentral.csproj
+++ b/src/IotCentral/IotCentral/IotCentral.csproj
@@ -1,4 +1,4 @@
-
+
IotCentral
@@ -15,4 +15,6 @@
+
+
diff --git a/src/IotHub/IotHub/IotHub.csproj b/src/IotHub/IotHub/IotHub.csproj
index 7216c99b01c7..4b1da058e18e 100644
--- a/src/IotHub/IotHub/IotHub.csproj
+++ b/src/IotHub/IotHub/IotHub.csproj
@@ -1,4 +1,4 @@
-
+
IotHub
@@ -21,4 +21,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/KeyVault/KeyVault/KeyVault.csproj b/src/KeyVault/KeyVault/KeyVault.csproj
index ad0b036683a4..68c1ccc250de 100644
--- a/src/KeyVault/KeyVault/KeyVault.csproj
+++ b/src/KeyVault/KeyVault/KeyVault.csproj
@@ -1,4 +1,4 @@
-
+
KeyVault
@@ -37,4 +37,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj b/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
index e02730bca5f4..0987fa2dab82 100644
--- a/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
+++ b/src/KubernetesConfiguration/Az.KubernetesConfiguration.csproj
@@ -4,4 +4,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Kusto/Az.Kusto.csproj b/src/Kusto/Az.Kusto.csproj
index 785d1ede5822..93b6a44037ac 100644
--- a/src/Kusto/Az.Kusto.csproj
+++ b/src/Kusto/Az.Kusto.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/LabServices/Az.LabServices.csproj b/src/LabServices/Az.LabServices.csproj
index 8c9b11e2107e..e3e5a57dd8e2 100644
--- a/src/LabServices/Az.LabServices.csproj
+++ b/src/LabServices/Az.LabServices.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/LogicApp/LogicApp/LogicApp.csproj b/src/LogicApp/LogicApp/LogicApp.csproj
index 3a40ae58c627..0fdadbf93f15 100644
--- a/src/LogicApp/LogicApp/LogicApp.csproj
+++ b/src/LogicApp/LogicApp/LogicApp.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Logz/Az.Logz.csproj b/src/Logz/Az.Logz.csproj
index 68cb24e8af32..a25d2ca7e5fe 100644
--- a/src/Logz/Az.Logz.csproj
+++ b/src/Logz/Az.Logz.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/MachineLearning/MachineLearning/MachineLearning.csproj b/src/MachineLearning/MachineLearning/MachineLearning.csproj
index 7b3929d23f72..0a6ddc65b8c6 100644
--- a/src/MachineLearning/MachineLearning/MachineLearning.csproj
+++ b/src/MachineLearning/MachineLearning/MachineLearning.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Maintenance/Maintenance/Maintenance.csproj b/src/Maintenance/Maintenance/Maintenance.csproj
index 4b07044ed6d6..d157ff6800f5 100644
--- a/src/Maintenance/Maintenance/Maintenance.csproj
+++ b/src/Maintenance/Maintenance/Maintenance.csproj
@@ -1,4 +1,4 @@
-
+
Maintenance
@@ -19,4 +19,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj b/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
index 953321a6d602..a1fb7caae013 100644
--- a/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
+++ b/src/ManagedServiceIdentity/Az.ManagedServiceIdentity.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ManagedServices/Az.ManagedServices.csproj b/src/ManagedServices/Az.ManagedServices.csproj
index cf7d26169315..c9dad5d0059b 100644
--- a/src/ManagedServices/Az.ManagedServices.csproj
+++ b/src/ManagedServices/Az.ManagedServices.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj b/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
index 95e0d5910fd1..9b4a75499628 100644
--- a/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
+++ b/src/ManagementPartner/ManagementPartner/ManagementPartner.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Maps/Az.Maps.csproj b/src/Maps/Az.Maps.csproj
index 6a22840ff288..01ecd98a76ab 100644
--- a/src/Maps/Az.Maps.csproj
+++ b/src/Maps/Az.Maps.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/MariaDb/Az.MariaDb.csproj b/src/MariaDb/Az.MariaDb.csproj
index d627a486ca2b..ea5d459b54b5 100644
--- a/src/MariaDb/Az.MariaDb.csproj
+++ b/src/MariaDb/Az.MariaDb.csproj
@@ -4,4 +4,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj b/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
index fcfe82b4966a..04f84d720d5e 100644
--- a/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
+++ b/src/Marketplace/Marketplace.Autorest/Az.Marketplace.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Marketplace/Marketplace/Marketplace.csproj b/src/Marketplace/Marketplace/Marketplace.csproj
index 5d2e17e277c2..d463c94004a5 100644
--- a/src/Marketplace/Marketplace/Marketplace.csproj
+++ b/src/Marketplace/Marketplace/Marketplace.csproj
@@ -1,4 +1,4 @@
-
+
Marketplace
@@ -24,4 +24,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj b/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
index b6ce1fc817ce..3f2c4ba78c73 100644
--- a/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
+++ b/src/MarketplaceOrdering/MarketplaceOrdering/MarketplaceOrdering.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Media/Media/Media.csproj b/src/Media/Media/Media.csproj
index 9b03fea76c4b..12b0e2de50c4 100644
--- a/src/Media/Media/Media.csproj
+++ b/src/Media/Media/Media.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Migrate/Az.Migrate.csproj b/src/Migrate/Az.Migrate.csproj
index 0c08ff47abb8..11b71381860e 100644
--- a/src/Migrate/Az.Migrate.csproj
+++ b/src/Migrate/Az.Migrate.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/MixedReality/MixedReality/MixedReality.csproj b/src/MixedReality/MixedReality/MixedReality.csproj
index ab4e806ec4b9..990e9725d937 100644
--- a/src/MixedReality/MixedReality/MixedReality.csproj
+++ b/src/MixedReality/MixedReality/MixedReality.csproj
@@ -10,4 +10,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Monitor/Monitor/Monitor.csproj b/src/Monitor/Monitor/Monitor.csproj
index adbe579cf437..777efb12c7c7 100644
--- a/src/Monitor/Monitor/Monitor.csproj
+++ b/src/Monitor/Monitor/Monitor.csproj
@@ -1,4 +1,4 @@
-
+
Monitor
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/MonitoringSolutions/Az.MonitoringSolutions.csproj b/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
index 0dfa9a7586b4..6c6c358fe57b 100644
--- a/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
+++ b/src/MonitoringSolutions/Az.MonitoringSolutions.csproj
@@ -1,7 +1,9 @@
-
+
MonitoringSolutions
-
\ No newline at end of file
+
+
+
diff --git a/src/MySql/Az.MySql.csproj b/src/MySql/Az.MySql.csproj
index 660d719f49cc..4e29dbab765b 100644
--- a/src/MySql/Az.MySql.csproj
+++ b/src/MySql/Az.MySql.csproj
@@ -4,4 +4,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj b/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
index 8bd0f3d35b86..0b12f2c343f8 100644
--- a/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
+++ b/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
@@ -39,4 +39,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj
index 53f4bd6d3151..dcafbcaf9818 100644
--- a/src/Network/Network/Network.csproj
+++ b/src/Network/Network/Network.csproj
@@ -41,4 +41,6 @@
+
+
diff --git a/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj b/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
index 9e9324a0a5d1..61513ffa3ba6 100644
--- a/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
+++ b/src/NotificationHubs/NotificationHubs/NotificationHubs.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj b/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
index bfc83bbfe6c3..438b188983a3 100644
--- a/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
+++ b/src/OperationalInsights/OperationalInsights/OperationalInsights.csproj
@@ -1,4 +1,4 @@
-
+
OperationalInsights
@@ -30,4 +30,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Peering/Peering/Peering.csproj b/src/Peering/Peering/Peering.csproj
index a3beb5841911..e54ca470b984 100644
--- a/src/Peering/Peering/Peering.csproj
+++ b/src/Peering/Peering/Peering.csproj
@@ -1,4 +1,4 @@
-
+
Peering
@@ -29,4 +29,6 @@
Resources.Designer.cs
-
\ No newline at end of file
+
+
+
diff --git a/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj b/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
index 359ac52d0eca..9f9f38a0c4e7 100644
--- a/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
+++ b/src/PolicyInsights/PolicyInsights/PolicyInsights.csproj
@@ -20,4 +20,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Portal/Az.Portal.csproj b/src/Portal/Az.Portal.csproj
index 43f1b9b484e0..7ebd7e2fd410 100644
--- a/src/Portal/Az.Portal.csproj
+++ b/src/Portal/Az.Portal.csproj
@@ -1,7 +1,9 @@
-
+
Portal
-
\ No newline at end of file
+
+
+
diff --git a/src/PostgreSql/Az.PostgreSql.csproj b/src/PostgreSql/Az.PostgreSql.csproj
index 25bff109937b..85bace73f898 100644
--- a/src/PostgreSql/Az.PostgreSql.csproj
+++ b/src/PostgreSql/Az.PostgreSql.csproj
@@ -4,4 +4,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/PowerBIEmbedded/PowerBI/PowerBI.csproj b/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
index 8d6f73718a8f..92e4ed53b54e 100644
--- a/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
+++ b/src/PowerBIEmbedded/PowerBI/PowerBI.csproj
@@ -20,4 +20,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj b/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
index 67126f8664de..cf544f41275a 100644
--- a/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
+++ b/src/PowerBIEmbedded/PowerBIEmbedded/PowerBIEmbedded.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/PrivateDns/PrivateDns/PrivateDns.csproj b/src/PrivateDns/PrivateDns/PrivateDns.csproj
index a64c79893aec..b39ed4fa48de 100644
--- a/src/PrivateDns/PrivateDns/PrivateDns.csproj
+++ b/src/PrivateDns/PrivateDns/PrivateDns.csproj
@@ -1,4 +1,4 @@
-
+
PrivateDns
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ProviderHub/Az.ProviderHub.csproj b/src/ProviderHub/Az.ProviderHub.csproj
index 3de9aeb2921a..cb6972c9d7a3 100644
--- a/src/ProviderHub/Az.ProviderHub.csproj
+++ b/src/ProviderHub/Az.ProviderHub.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Purview/Purview.Autorest/Az.Purview.csproj b/src/Purview/Purview.Autorest/Az.Purview.csproj
index e0ff393095d8..4b98ed7f3589 100644
--- a/src/Purview/Purview.Autorest/Az.Purview.csproj
+++ b/src/Purview/Purview.Autorest/Az.Purview.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Purview/Purview/Purview.csproj b/src/Purview/Purview/Purview.csproj
index f0687a335e3e..7d1b5fabbfc3 100644
--- a/src/Purview/Purview/Purview.csproj
+++ b/src/Purview/Purview/Purview.csproj
@@ -23,4 +23,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj b/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
index d4669f669e0d..bee233bb9e5e 100644
--- a/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
+++ b/src/Purview/Purviewdata.Autorest/Az.Purviewdata.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Quota/Az.Quota.csproj b/src/Quota/Az.Quota.csproj
index e0e35d5713a3..ded7d9c5b8f6 100644
--- a/src/Quota/Az.Quota.csproj
+++ b/src/Quota/Az.Quota.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj b/src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj
index 5529d8c8fb4d..d23b10c99b85 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 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj b/src/RecoveryServices/RecoveryServices.Backup.Logger/RecoveryServices.Backup.Logger.csproj
index 4cc1c2f0716c..02e454bd9ab6 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 @@
$(LegacyAssemblyPrefix)$(PsModuleName).Backup
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
index 920bd2da7f1a..4a8fe0495b88 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 @@
-
+
RecoveryServices
@@ -21,4 +21,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj b/src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj
index bb55417c6d66..a4d21bdf1877 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 @@
-
+
RecoveryServices
@@ -19,4 +19,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj b/src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj
index 5d184e592895..7591bb8f81d1 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 @@
-
+
RecoveryServices
@@ -22,4 +22,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj b/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
index 8dd14ecbe531..39349044b090 100644
--- a/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj
@@ -1,4 +1,4 @@
-
+
RecoveryServices
@@ -24,4 +24,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
index 6562ca496673..39e54d46d5da 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
@@ -1,4 +1,4 @@
-
+
RecoveryServices
@@ -36,4 +36,6 @@
+
+
diff --git a/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj b/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
index df685a88f3f9..e4d6461a38d1 100644
--- a/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
+++ b/src/RecoveryServices/RecoveryServices/RecoveryServices.csproj
@@ -1,4 +1,4 @@
-
+
RecoveryServices
@@ -31,4 +31,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RedisCache/RedisCache/RedisCache.csproj b/src/RedisCache/RedisCache/RedisCache.csproj
index 613cc7dc0210..7127352b3cab 100644
--- a/src/RedisCache/RedisCache/RedisCache.csproj
+++ b/src/RedisCache/RedisCache/RedisCache.csproj
@@ -1,4 +1,4 @@
-
+
RedisCache
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj b/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
index dca33b7b3993..f7bbecae84f5 100644
--- a/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
+++ b/src/RedisEnterpriseCache/Az.RedisEnterpriseCache.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Relay/Relay/Relay.csproj b/src/Relay/Relay/Relay.csproj
index 3bc94b385fc5..283ac1cc040b 100644
--- a/src/Relay/Relay/Relay.csproj
+++ b/src/Relay/Relay/Relay.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Reservations/Reservations/Reservations.csproj b/src/Reservations/Reservations/Reservations.csproj
index 03d1479780de..b97fc6d105c2 100644
--- a/src/Reservations/Reservations/Reservations.csproj
+++ b/src/Reservations/Reservations/Reservations.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj b/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
index a0149b2962a9..197a6f04f426 100644
--- a/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
+++ b/src/ResourceGraph/ResourceGraph.Autorest/Az.ResourceGraph.csproj
@@ -5,4 +5,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj b/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
index dbc2d73a6457..0f0d3f5959d4 100644
--- a/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
+++ b/src/ResourceGraph/ResourceGraph/ResourceGraph.csproj
@@ -1,4 +1,4 @@
-
+
ResourceGraph
@@ -15,4 +15,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ResourceMover/Az.ResourceMover.csproj b/src/ResourceMover/Az.ResourceMover.csproj
index feaa0653b3f0..7b6b776bde43 100644
--- a/src/ResourceMover/Az.ResourceMover.csproj
+++ b/src/ResourceMover/Az.ResourceMover.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Resources/Authorization.Autorest/Az.Authorization.csproj b/src/Resources/Authorization.Autorest/Az.Authorization.csproj
index ddb564885335..d9cd167ca459 100644
--- a/src/Resources/Authorization.Autorest/Az.Authorization.csproj
+++ b/src/Resources/Authorization.Autorest/Az.Authorization.csproj
@@ -5,4 +5,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj b/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
index f8ad4315bd19..356591431feb 100644
--- a/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
+++ b/src/Resources/MSGraph.Autorest/Az.MSGraph.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
index 8375c8dbec2d..821b1e4d24b7 100644
--- a/src/Resources/ResourceManager/ResourceManager.csproj
+++ b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -1,4 +1,4 @@
-
+
Resources
@@ -37,4 +37,6 @@
+
+
diff --git a/src/Resources/Resources/Resources.csproj b/src/Resources/Resources/Resources.csproj
index 40d7ac55c598..02bccd9fe8e2 100644
--- a/src/Resources/Resources/Resources.csproj
+++ b/src/Resources/Resources/Resources.csproj
@@ -1,4 +1,4 @@
-
+
Resources
@@ -40,4 +40,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Resources/Tags/Tags.csproj b/src/Resources/Tags/Tags.csproj
index 81c836176ea7..c9d8a8aff475 100644
--- a/src/Resources/Tags/Tags.csproj
+++ b/src/Resources/Tags/Tags.csproj
@@ -1,4 +1,4 @@
-
+
Resources
@@ -15,4 +15,6 @@
+
+
diff --git a/src/Search/Search/Search.csproj b/src/Search/Search/Search.csproj
index 4ee0abd31209..75962572ebd3 100644
--- a/src/Search/Search/Search.csproj
+++ b/src/Search/Search/Search.csproj
@@ -1,4 +1,4 @@
-
+
Search
@@ -20,4 +20,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Security/Security/Security.csproj b/src/Security/Security/Security.csproj
index fa8c6b4b6441..735a4ffb4f09 100644
--- a/src/Security/Security/Security.csproj
+++ b/src/Security/Security/Security.csproj
@@ -1,4 +1,4 @@
-
+
Security
@@ -29,4 +29,6 @@
+
+
diff --git a/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj b/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
index 03254f0846f3..ae0e2b6055b9 100644
--- a/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
+++ b/src/SecurityInsights/SecurityInsights/SecurityInsights.csproj
@@ -10,4 +10,6 @@
+
+
diff --git a/src/ServiceBus/ServiceBus/ServiceBus.csproj b/src/ServiceBus/ServiceBus/ServiceBus.csproj
index b5beaf2e2f59..7d01c81de75f 100644
--- a/src/ServiceBus/ServiceBus/ServiceBus.csproj
+++ b/src/ServiceBus/ServiceBus/ServiceBus.csproj
@@ -1,4 +1,4 @@
-
+
ServiceBus
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj b/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
index 92fb4f2a8654..e53d640f6895 100644
--- a/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
+++ b/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
@@ -1,4 +1,4 @@
-
+
ServiceFabric
@@ -36,4 +36,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/ServiceLinker/Az.ServiceLinker.csproj b/src/ServiceLinker/Az.ServiceLinker.csproj
index 722e6e7a6865..d3ea654ab37a 100644
--- a/src/ServiceLinker/Az.ServiceLinker.csproj
+++ b/src/ServiceLinker/Az.ServiceLinker.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/SignalR/SignalR.Autorest/Az.SignalR.csproj b/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
index 3e6ad0fa4c28..c024c43aa33e 100644
--- a/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
+++ b/src/SignalR/SignalR.Autorest/Az.SignalR.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/SignalR/SignalR/SignalR.csproj b/src/SignalR/SignalR/SignalR.csproj
index 52c389fc470e..45492e9a56f4 100644
--- a/src/SignalR/SignalR/SignalR.csproj
+++ b/src/SignalR/SignalR/SignalR.csproj
@@ -25,4 +25,6 @@
+
+
diff --git a/src/SpringCloud/Az.SpringCloud.csproj b/src/SpringCloud/Az.SpringCloud.csproj
index 06904d1cfcfc..ca9138b6464c 100644
--- a/src/SpringCloud/Az.SpringCloud.csproj
+++ b/src/SpringCloud/Az.SpringCloud.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
index 601cd9349926..4a897f4550d0 100644
--- a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
+++ b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
@@ -16,4 +16,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Sql/Sql/Sql.csproj b/src/Sql/Sql/Sql.csproj
index 935166c011a7..0cb4765c6f7d 100644
--- a/src/Sql/Sql/Sql.csproj
+++ b/src/Sql/Sql/Sql.csproj
@@ -1,4 +1,4 @@
-
+
Sql
@@ -43,4 +43,6 @@
+
+
diff --git a/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj b/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
index 2620ec05397c..aa68ffcd2dbb 100644
--- a/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
+++ b/src/SqlVirtualMachine/SqlVirtualMachine/SqlVirtualMachine.csproj
@@ -1,4 +1,4 @@
-
+
SqlVirtualMachine
@@ -18,4 +18,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/StackHCI/Az.StackHCI.csproj b/src/StackHCI/Az.StackHCI.csproj
index 62cd74bcd761..66c444d20952 100644
--- a/src/StackHCI/Az.StackHCI.csproj
+++ b/src/StackHCI/Az.StackHCI.csproj
@@ -1,7 +1,9 @@
-
+
StackHCI
-
\ No newline at end of file
+
+
+
diff --git a/src/Storage/Storage.Management/Storage.Management.csproj b/src/Storage/Storage.Management/Storage.Management.csproj
index c938fa96f3ba..40f8689737fb 100644
--- a/src/Storage/Storage.Management/Storage.Management.csproj
+++ b/src/Storage/Storage.Management/Storage.Management.csproj
@@ -1,4 +1,4 @@
-
+
Storage
true
@@ -24,4 +24,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Storage/Storage/Storage.csproj b/src/Storage/Storage/Storage.csproj
index 40dcb9c26faa..791f91d9d390 100644
--- a/src/Storage/Storage/Storage.csproj
+++ b/src/Storage/Storage/Storage.csproj
@@ -1,4 +1,4 @@
-
+
Storage
@@ -32,4 +32,6 @@
$(RepoSrc)lib\Microsoft.Azure.Storage.DataMovement.dll
-
\ No newline at end of file
+
+
+
diff --git a/src/StorageSync/StorageSync/StorageSync.csproj b/src/StorageSync/StorageSync/StorageSync.csproj
index f52b0ddbde42..97bf60807ee2 100644
--- a/src/StorageSync/StorageSync/StorageSync.csproj
+++ b/src/StorageSync/StorageSync/StorageSync.csproj
@@ -1,4 +1,4 @@
-
+
StorageSync
@@ -51,4 +51,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/StreamAnalytics/Az.StreamAnalytics.csproj b/src/StreamAnalytics/Az.StreamAnalytics.csproj
index 8b45e1680683..f9cfba6b117d 100644
--- a/src/StreamAnalytics/Az.StreamAnalytics.csproj
+++ b/src/StreamAnalytics/Az.StreamAnalytics.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Subscription/Subscription/Subscription.csproj b/src/Subscription/Subscription/Subscription.csproj
index 9dfb7bfde93a..df0751c71336 100644
--- a/src/Subscription/Subscription/Subscription.csproj
+++ b/src/Subscription/Subscription/Subscription.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Support/Support/Support.csproj b/src/Support/Support/Support.csproj
index c7ce2d7ce8aa..9d6cf4dd7d30 100644
--- a/src/Support/Support/Support.csproj
+++ b/src/Support/Support/Support.csproj
@@ -1,4 +1,4 @@
-
+
Support
@@ -11,4 +11,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Synapse/Synapse.Autorest/Az.Synapse.csproj b/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
index d6fbeddaffb9..ed3b4fe892bc 100644
--- a/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
+++ b/src/Synapse/Synapse.Autorest/Az.Synapse.csproj
@@ -5,4 +5,6 @@
+
+
diff --git a/src/Synapse/Synapse/Synapse.csproj b/src/Synapse/Synapse/Synapse.csproj
index a7c35b40f7ed..39b000739993 100644
--- a/src/Synapse/Synapse/Synapse.csproj
+++ b/src/Synapse/Synapse/Synapse.csproj
@@ -1,4 +1,4 @@
-
+
Synapse
@@ -43,4 +43,6 @@
+
+
diff --git a/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj b/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
index efcc3a4908a4..45d1e8470fb4 100644
--- a/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
+++ b/src/TimeSeriesInsights/Az.TimeSeriesInsights.csproj
@@ -1,7 +1,9 @@
-
+
TimeSeriesInsights
-
\ No newline at end of file
+
+
+
diff --git a/src/TrafficManager/TrafficManager/TrafficManager.csproj b/src/TrafficManager/TrafficManager/TrafficManager.csproj
index 09f246d48289..e992beec2a94 100644
--- a/src/TrafficManager/TrafficManager/TrafficManager.csproj
+++ b/src/TrafficManager/TrafficManager/TrafficManager.csproj
@@ -14,4 +14,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/VMware/Az.VMware.csproj b/src/VMware/Az.VMware.csproj
index cf83c84cbd28..a9195ed247f1 100644
--- a/src/VMware/Az.VMware.csproj
+++ b/src/VMware/Az.VMware.csproj
@@ -4,4 +4,6 @@
+
+
diff --git a/src/Websites/Websites.Autorest/Az.Websites.csproj b/src/Websites/Websites.Autorest/Az.Websites.csproj
index 96bfda0ef098..fe8aa6bb4845 100644
--- a/src/Websites/Websites.Autorest/Az.Websites.csproj
+++ b/src/Websites/Websites.Autorest/Az.Websites.csproj
@@ -5,4 +5,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/Websites/Websites.Helper/Websites.Helper.csproj b/src/Websites/Websites.Helper/Websites.Helper.csproj
index 0377a5f481aa..9f464f21aeda 100644
--- a/src/Websites/Websites.Helper/Websites.Helper.csproj
+++ b/src/Websites/Websites.Helper/Websites.Helper.csproj
@@ -16,4 +16,6 @@
+
+
diff --git a/src/Websites/Websites/Websites.csproj b/src/Websites/Websites/Websites.csproj
index 3166a4299f24..4daf8f9483d5 100644
--- a/src/Websites/Websites/Websites.csproj
+++ b/src/Websites/Websites/Websites.csproj
@@ -1,4 +1,4 @@
-
+
Websites
@@ -39,4 +39,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/WindowsIotServices/Az.WindowsIotServices.csproj b/src/WindowsIotServices/Az.WindowsIotServices.csproj
index 64e6613eeb47..84530d011d5b 100644
--- a/src/WindowsIotServices/Az.WindowsIotServices.csproj
+++ b/src/WindowsIotServices/Az.WindowsIotServices.csproj
@@ -4,4 +4,6 @@
+
+
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 @@
+
\ 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 @@
+
\ No newline at end of file
diff --git a/tools/Gen2Master/Templates/HandcraftedModule.csproj b/tools/Gen2Master/Templates/HandcraftedModule.csproj
index b34ae9c6ea49..73a97b41382d 100644
--- a/tools/Gen2Master/Templates/HandcraftedModule.csproj
+++ b/tools/Gen2Master/Templates/HandcraftedModule.csproj
@@ -23,4 +23,6 @@
+
+
\ No newline at end of file