diff --git a/Repo.props b/Repo.props
new file mode 100644
index 000000000000..6bc6321aa3ad
--- /dev/null
+++ b/Repo.props
@@ -0,0 +1,10 @@
+
+
+
+ $(MSBuildThisFileDirectory)
+ $(RepoRoot)src\
+ $(RepoSrc)Package\
+ $(RepoRoot)tools\
+
+
+
\ No newline at end of file
diff --git a/src/Az.props b/src/Az.props
new file mode 100644
index 000000000000..753c282322ae
--- /dev/null
+++ b/src/Az.props
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+ Microsoft.Azure.PowerShell.Cmdlets.
+ Microsoft.Azure.Commands.
+
+
+
+ netstandard2.0
+ $(AzAssemblyPrefix)$(PsModuleName)
+ $(AzAssemblyPrefix)$(PsModuleName)
+ false
+ true
+ false
+ $(RepoArtifacts)$(Configuration)\ResourceManager\AzureResourceManager\Az.$(PsModuleName)\
+ true
+
+
+
+
+ false
+ TRACE;DEBUG;NETSTANDARD
+
+
+
+ true
+ true
+ $(RepoSrc)MSSharedLibKey.snk
+ TRACE;RELEASE;NETSTANDARD;SIGN
+
+
+
\ No newline at end of file
diff --git a/src/MSSharedLibKey.snk b/src/MSSharedLibKey.snk
new file mode 100644
index 000000000000..695f1b38774e
Binary files /dev/null and b/src/MSSharedLibKey.snk differ
diff --git a/src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj b/src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj
index 27e240f1066e..6fa87d84f7e3 100644
--- a/src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj
+++ b/src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj
@@ -1,29 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Aks
- Microsoft.Azure.Commands.Aks
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Aks\
- true
-
+ Aks
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj
index d8da7fa2f744..bd7546026baa 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Dataplane
- Microsoft.Azure.Commands.AnalysisServices.Dataplane
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.AnalysisServices\
- true
-
+ AnalysisServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Dataplane
+ $(LegacyAssemblyPrefix)$(PsModuleName).Dataplane
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj
index ac61418ceb83..ed806867ad36 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices
- Microsoft.Azure.Commands.AnalysisServices
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.AnalysisServices\
- true
-
+ AnalysisServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj
index c9a688b0956a..e46f0d8dd89f 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement
- Microsoft.Azure.Commands.ApiManagement.ServiceManagement
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ApiManagement\
- true
-
+ ApiManagement
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).ServiceManagement
+ $(LegacyAssemblyPrefix)$(PsModuleName).ServiceManagement
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
index 41ccf16aaa3a..4465bb8da9eb 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
@@ -1,34 +1,14 @@
+ ApiManagement
true
-
+
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ApiManagement
- Microsoft.Azure.Commands.ApiManagement
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ApiManagement\
- true
-
-
-
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj b/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj
index f511163ac93a..612e9fded1fe 100644
--- a/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj
+++ b/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights
- Microsoft.Azure.Commands.ApplicationInsights
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ApplicationInsights\
- true
-
+ ApplicationInsights
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj
index 950becf2e68d..669bf72066a3 100644
--- a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj
+++ b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Automation
- Microsoft.Azure.Commands.Automation
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Automation\
- true
-
+ Automation
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.Netcore.csproj b/src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.Netcore.csproj
index e529228d5c35..56fa7cc38d9b 100644
--- a/src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.Netcore.csproj
+++ b/src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.Netcore.csproj
@@ -1,6 +1,7 @@
-
+
+
netstandard2.0
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj
index b2152211b84a..41cb11a0d352 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj
+++ b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj
@@ -1,34 +1,14 @@
+ Batch
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Batch
- Microsoft.Azure.Commands.Batch
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Batch\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Billing/Commands.Billing/Commands.Billing.Netcore.csproj b/src/ResourceManager/Billing/Commands.Billing/Commands.Billing.Netcore.csproj
index c64b0c889c1e..176544dac42f 100644
--- a/src/ResourceManager/Billing/Commands.Billing/Commands.Billing.Netcore.csproj
+++ b/src/ResourceManager/Billing/Commands.Billing/Commands.Billing.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Billing
- Microsoft.Azure.Commands.Billing
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\
- true
-
+ Billing
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Billing/Commands.Consumption/Commands.Consumption.Netcore.csproj b/src/ResourceManager/Billing/Commands.Consumption/Commands.Consumption.Netcore.csproj
index b0d99595de3d..a08b1ce0f718 100644
--- a/src/ResourceManager/Billing/Commands.Consumption/Commands.Consumption.Netcore.csproj
+++ b/src/ResourceManager/Billing/Commands.Consumption/Commands.Consumption.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Consumption
- Microsoft.Azure.Commands.Consumption
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\
- true
-
+ Billing
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Consumption
+ $(LegacyAssemblyPrefix)Consumption
diff --git a/src/ResourceManager/Billing/Commands.UsageAggregates/Commands.UsageAggregates.Netcore.csproj b/src/ResourceManager/Billing/Commands.UsageAggregates/Commands.UsageAggregates.Netcore.csproj
index 41d8dd74dc8b..48da0ffd836c 100644
--- a/src/ResourceManager/Billing/Commands.UsageAggregates/Commands.UsageAggregates.Netcore.csproj
+++ b/src/ResourceManager/Billing/Commands.UsageAggregates/Commands.UsageAggregates.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.UsageAggregates
- Microsoft.Azure.Commands.UsageAggregates
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\
- true
-
+ Billing
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)UsageAggregates
+ $(LegacyAssemblyPrefix)UsageAggregates
diff --git a/src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.Netcore.csproj b/src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.Netcore.csproj
index 895f6c41aac9..4c07b849cc8f 100644
--- a/src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.Netcore.csproj
+++ b/src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Cdn
- Microsoft.Azure.Commands.Cdn
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Cdn\
- true
-
+ Cdn
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.Netcore.csproj b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.Netcore.csproj
index c626c2c278c9..b7113121e59c 100644
--- a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.Netcore.csproj
+++ b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Management.CognitiveServices
- Microsoft.Azure.Commands.Management.CognitiveServices
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.CognitiveServices\
- true
-
+ CognitiveServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Management.$(PsModuleName)
+ $(LegacyAssemblyPrefix)Management.$(PsModuleName)
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
index 19b67783aafd..08edbbf5071b 100644
--- a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
+++ b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
@@ -1,34 +1,14 @@
+ Compute
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Compute
- Microsoft.Azure.Commands.Compute
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Compute\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands.ContainerInstance.Netcore.csproj b/src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands.ContainerInstance.Netcore.csproj
index afb2bd681e10..15f98dbb6dd3 100644
--- a/src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands.ContainerInstance.Netcore.csproj
+++ b/src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands.ContainerInstance.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance
- Microsoft.Azure.Commands.ContainerInstance
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ContainerInstance\
- true
-
+ ContainerInstance
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands.ContainerRegistry.Netcore.csproj b/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands.ContainerRegistry.Netcore.csproj
index 2e02506a72ed..f146357dcce7 100644
--- a/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands.ContainerRegistry.Netcore.csproj
+++ b/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands.ContainerRegistry.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry
- Microsoft.Azure.Commands.ContainerRegistry
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ContainerRegistry\
- true
-
+ ContainerRegistry
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DataFactoryV2/Commands.DataFactories/Commands.DataFactories.Netcore.csproj b/src/ResourceManager/DataFactoryV2/Commands.DataFactories/Commands.DataFactories.Netcore.csproj
index 22d7e8b11d2c..9c00fcb1ca6a 100644
--- a/src/ResourceManager/DataFactoryV2/Commands.DataFactories/Commands.DataFactories.Netcore.csproj
+++ b/src/ResourceManager/DataFactoryV2/Commands.DataFactories/Commands.DataFactories.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DataFactories
- Microsoft.Azure.Commands.DataFactories
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataFactory\
- true
-
+ DataFactory
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)DataFactories
+ $(LegacyAssemblyPrefix)DataFactories
diff --git a/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.Netcore.csproj b/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.Netcore.csproj
index 9fca23ba2ceb..388b5f573480 100644
--- a/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.Netcore.csproj
+++ b/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DataFactoryV2
- Microsoft.Azure.Commands.DataFactoryV2
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataFactory\
- true
-
+ DataFactory
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)DataFactoryV2
+ $(LegacyAssemblyPrefix)DataFactoryV2
diff --git a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.Netcore.csproj b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.Netcore.csproj
index 4ca7400712e5..2d212e578a44 100644
--- a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.Netcore.csproj
+++ b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DataLakeAnalytics
- Microsoft.Azure.Commands.DataLakeAnalytics
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataLakeAnalytics\
- true
-
+ DataLakeAnalytics
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj
index 59e664452fa5..76002b293b82 100644
--- a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj
+++ b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj
@@ -1,34 +1,14 @@
+ DataLakeStore
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DataLakeStore
- Microsoft.Azure.Commands.DataLakeStore
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataLakeStore\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DataMigration/Commands.DataMigration/Commands.DataMigration.Netcore.csproj b/src/ResourceManager/DataMigration/Commands.DataMigration/Commands.DataMigration.Netcore.csproj
index c47ae01601a7..f3e07b91d10d 100644
--- a/src/ResourceManager/DataMigration/Commands.DataMigration/Commands.DataMigration.Netcore.csproj
+++ b/src/ResourceManager/DataMigration/Commands.DataMigration/Commands.DataMigration.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DataMigration
- Microsoft.Azure.Commands.DataMigration
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataMigration\
- true
-
+ DataMigration
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DevSpaces/Commands.DevSpaces/Commands.DevSpaces.Netcore.csproj b/src/ResourceManager/DevSpaces/Commands.DevSpaces/Commands.DevSpaces.Netcore.csproj
index 2dca3e21b551..4d04840f7240 100644
--- a/src/ResourceManager/DevSpaces/Commands.DevSpaces/Commands.DevSpaces.Netcore.csproj
+++ b/src/ResourceManager/DevSpaces/Commands.DevSpaces/Commands.DevSpaces.Netcore.csproj
@@ -1,29 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DevSpaces
- Microsoft.Azure.Commands.DevSpaces
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DevSpaces\
- true
-
+ DevSpaces
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands.DevTestLabs.Netcore.csproj b/src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands.DevTestLabs.Netcore.csproj
index 6b44189252a4..2cbe53867d79 100644
--- a/src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands.DevTestLabs.Netcore.csproj
+++ b/src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands.DevTestLabs.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DevTestLabs
- Microsoft.Azure.Commands.DevTestLabs
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DevTestLabs\
- true
-
+ DevTestLabs
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/DeviceProvisioningServices/Commands.DeviceProvisioningServices/Commands.DeviceProvisioningServices.Netcore.csproj b/src/ResourceManager/DeviceProvisioningServices/Commands.DeviceProvisioningServices/Commands.DeviceProvisioningServices.Netcore.csproj
index 2b0b29555484..d054649c6745 100644
--- a/src/ResourceManager/DeviceProvisioningServices/Commands.DeviceProvisioningServices/Commands.DeviceProvisioningServices.Netcore.csproj
+++ b/src/ResourceManager/DeviceProvisioningServices/Commands.DeviceProvisioningServices/Commands.DeviceProvisioningServices.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.DeviceProvisioningServices
- Microsoft.Azure.Commands.DeviceProvisioningServices
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DeviceProvisioningServices\
- true
-
+ DeviceProvisioningServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.Netcore.csproj b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.Netcore.csproj
index 1d3ee6a4d9af..8430c9f61305 100644
--- a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.Netcore.csproj
+++ b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Dns
- Microsoft.Azure.Commands.Dns
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Dns\
- true
-
+ Dns
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/EventGrid/Commands.EventGrid/Commands.EventGrid.Netcore.csproj b/src/ResourceManager/EventGrid/Commands.EventGrid/Commands.EventGrid.Netcore.csproj
index 979e5160a027..a9177563a152 100644
--- a/src/ResourceManager/EventGrid/Commands.EventGrid/Commands.EventGrid.Netcore.csproj
+++ b/src/ResourceManager/EventGrid/Commands.EventGrid/Commands.EventGrid.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.EventGrid
- Microsoft.Azure.Commands.EventGrid
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventGrid\
- true
-
+ EventGrid
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.Netcore.csproj b/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.Netcore.csproj
index 979d2d5af92f..9a05621ada8d 100644
--- a/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.Netcore.csproj
+++ b/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.EventHub
- Microsoft.Azure.Commands.EventHub
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventHub\
- true
-
+ EventHub
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/FrontDoor/Commands.FrontDoor/Commands.FrontDoor.Netcore.csproj b/src/ResourceManager/FrontDoor/Commands.FrontDoor/Commands.FrontDoor.Netcore.csproj
index aed8e927ccea..824426682abe 100644
--- a/src/ResourceManager/FrontDoor/Commands.FrontDoor/Commands.FrontDoor.Netcore.csproj
+++ b/src/ResourceManager/FrontDoor/Commands.FrontDoor/Commands.FrontDoor.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.FrontDoor
- Microsoft.Azure.Commands.FrontDoor
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.FrontDoor\
- true
-
+ FrontDoor
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.Netcore.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.Netcore.csproj
index f4f5f798ea53..e775c4898460 100644
--- a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.Netcore.csproj
+++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.HDInsight
- Microsoft.Azure.Commands.HDInsight
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.HDInsight\
- true
-
+ HDInsight
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.Netcore.csproj b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.Netcore.csproj
index fdf45aae21ed..112bea860c0b 100644
--- a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.Netcore.csproj
+++ b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Monitor
- Microsoft.Azure.Commands.Insights
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Monitor\
- true
-
+ Monitor
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)Insights
diff --git a/src/ResourceManager/IotCentral/Commands.IotCentral/Commands.IotCentral.Netcore.csproj b/src/ResourceManager/IotCentral/Commands.IotCentral/Commands.IotCentral.Netcore.csproj
index adc14cd0272d..8acd956fd9ff 100644
--- a/src/ResourceManager/IotCentral/Commands.IotCentral/Commands.IotCentral.Netcore.csproj
+++ b/src/ResourceManager/IotCentral/Commands.IotCentral/Commands.IotCentral.Netcore.csproj
@@ -1,34 +1,14 @@
+ IotCentral
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.IotCentral
- Microsoft.Azure.Commands.IotCentral
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.IotCentral\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.Netcore.csproj b/src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.Netcore.csproj
index 687716598dea..b1706592ca23 100644
--- a/src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.Netcore.csproj
+++ b/src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.IotHub
- Commands.IotHub
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.IotHub\
- true
-
+ IotHub
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ Commands.$(PsModuleName)
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj
index 1c900cab0217..653e23d33139 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj
@@ -1,31 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.KeyVault
- Microsoft.Azure.Commands.KeyVault
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.KeyVault\
- true
-
+ KeyVault
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
+ true
diff --git a/src/ResourceManager/LogicApp/Commands.LogicApp/Commands.LogicApp.Netcore.csproj b/src/ResourceManager/LogicApp/Commands.LogicApp/Commands.LogicApp.Netcore.csproj
index 5d14479baca1..5dd7639802d2 100644
--- a/src/ResourceManager/LogicApp/Commands.LogicApp/Commands.LogicApp.Netcore.csproj
+++ b/src/ResourceManager/LogicApp/Commands.LogicApp/Commands.LogicApp.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.LogicApp
- Microsoft.Azure.Commands.LogicApp
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.LogicApp\
- true
-
+ LogicApp
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.Netcore.csproj b/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.Netcore.csproj
index e68c9e1dfa0e..07b5d0f87eab 100644
--- a/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.Netcore.csproj
+++ b/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.MachineLearning
- Microsoft.Azure.Commands.MachineLearning
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MachineLearning\
- true
-
+ MachineLearning
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearningCompute/Commands.MachineLearningCompute.Netcore.csproj b/src/ResourceManager/MachineLearning/Commands.MachineLearningCompute/Commands.MachineLearningCompute.Netcore.csproj
index 77ec8813f7cd..d34c93bb6ddb 100644
--- a/src/ResourceManager/MachineLearning/Commands.MachineLearningCompute/Commands.MachineLearningCompute.Netcore.csproj
+++ b/src/ResourceManager/MachineLearning/Commands.MachineLearningCompute/Commands.MachineLearningCompute.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.MachineLearningCompute
- Microsoft.Azure.Commands.MachineLearningCompute
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MachineLearning\
- true
-
+ MachineLearning
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)MachineLearningCompute
+ $(LegacyAssemblyPrefix)MachineLearningCompute
diff --git a/src/ResourceManager/ManagedServiceIdentity/Commands.ManagedServiceIdentity/Commands.ManagedServiceIdentity.Netcore.csproj b/src/ResourceManager/ManagedServiceIdentity/Commands.ManagedServiceIdentity/Commands.ManagedServiceIdentity.Netcore.csproj
index be8ad35e4a83..fc88a6f9d1fd 100644
--- a/src/ResourceManager/ManagedServiceIdentity/Commands.ManagedServiceIdentity/Commands.ManagedServiceIdentity.Netcore.csproj
+++ b/src/ResourceManager/ManagedServiceIdentity/Commands.ManagedServiceIdentity/Commands.ManagedServiceIdentity.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ManagedServiceIdentity
- Microsoft.Azure.Commands.ManagedServiceIdentity
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ManagedServiceIdentity\
- true
-
+ ManagedServiceIdentity
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ManagementPartner/Commands.Partner/Commands.Partner.Netcore.csproj b/src/ResourceManager/ManagementPartner/Commands.Partner/Commands.Partner.Netcore.csproj
index c0d4c6a9987d..d3639bf71519 100644
--- a/src/ResourceManager/ManagementPartner/Commands.Partner/Commands.Partner.Netcore.csproj
+++ b/src/ResourceManager/ManagementPartner/Commands.Partner/Commands.Partner.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ManagementPartner
- Microsoft.Azure.Commands.ManagementPartner
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ManagementPartner\
- true
-
+ ManagementPartner
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Maps/Commands.Maps/Commands.Maps.Netcore.csproj b/src/ResourceManager/Maps/Commands.Maps/Commands.Maps.Netcore.csproj
index 133bb4ba0175..a7b58f8b5859 100644
--- a/src/ResourceManager/Maps/Commands.Maps/Commands.Maps.Netcore.csproj
+++ b/src/ResourceManager/Maps/Commands.Maps/Commands.Maps.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Maps
- Microsoft.Azure.Commands.Maps
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Maps\
- true
-
+ Maps
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/Commands.MarketplaceOrdering.Netcore.csproj b/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/Commands.MarketplaceOrdering.Netcore.csproj
index b7b66ec40708..a37ddd5aa57d 100644
--- a/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/Commands.MarketplaceOrdering.Netcore.csproj
+++ b/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/Commands.MarketplaceOrdering.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.MarketplaceOrdering
- Microsoft.Azure.Commands.MarketplaceOrdering
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MarketplaceOrdering\
- true
-
+ MarketplaceOrdering
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Media/Commands.Media/Commands.Media.Netcore.csproj b/src/ResourceManager/Media/Commands.Media/Commands.Media.Netcore.csproj
index 68668404ae3f..9be314ad21d3 100644
--- a/src/ResourceManager/Media/Commands.Media/Commands.Media.Netcore.csproj
+++ b/src/ResourceManager/Media/Commands.Media/Commands.Media.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Media
- Microsoft.Azure.Commands.Media
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Media\
- true
-
+ Media
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
index 8061afb46410..10c61373dc19 100644
--- a/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
+++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Network
- Microsoft.Azure.Commands.Network
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Network\
- true
-
+ Network
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/NotificationHubs/Commands.NotificationHubs/Commands.NotificationHubs.Netcore.csproj b/src/ResourceManager/NotificationHubs/Commands.NotificationHubs/Commands.NotificationHubs.Netcore.csproj
index b38ab39c4fd9..62317175021b 100644
--- a/src/ResourceManager/NotificationHubs/Commands.NotificationHubs/Commands.NotificationHubs.Netcore.csproj
+++ b/src/ResourceManager/NotificationHubs/Commands.NotificationHubs/Commands.NotificationHubs.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.NotificationHubs
- Microsoft.Azure.Commands.NotificationHubs
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.NotificationHubs\
- true
-
+ NotificationHubs
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.Netcore.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.Netcore.csproj
index e5146bf59b0c..ad6937cf8f93 100644
--- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.Netcore.csproj
+++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.OperationalInsights
- Microsoft.Azure.Commands.OperationalInsights
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.OperationalInsights\
- true
-
+ OperationalInsights
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/PolicyInsights/Commands.PolicyInsights/Commands.PolicyInsights.Netcore.csproj b/src/ResourceManager/PolicyInsights/Commands.PolicyInsights/Commands.PolicyInsights.Netcore.csproj
index 088389fc409f..bbc53e7893c5 100644
--- a/src/ResourceManager/PolicyInsights/Commands.PolicyInsights/Commands.PolicyInsights.Netcore.csproj
+++ b/src/ResourceManager/PolicyInsights/Commands.PolicyInsights/Commands.PolicyInsights.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.PolicyInsights
- Microsoft.Azure.Commands.PolicyInsights
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PolicyInsights\
- true
-
+ PolicyInsights
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/Commands.Management.PowerBIEmbedded.Netcore.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/Commands.Management.PowerBIEmbedded.Netcore.csproj
index 306802d27d35..dd5e22f83906 100644
--- a/src/ResourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/Commands.Management.PowerBIEmbedded.Netcore.csproj
+++ b/src/ResourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/Commands.Management.PowerBIEmbedded.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Management.PowerBIEmbedded
- Microsoft.Azure.Commands.Management.PowerBIEmbedded
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PowerBIEmbedded\
- true
-
+ PowerBIEmbedded
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Management.$(PsModuleName)
+ $(LegacyAssemblyPrefix)Management.$(PsModuleName)
diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj
index 361281552b4e..94a4ec6e322b 100644
--- a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj
+++ b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.PowerBI
- Microsoft.Azure.Commands.PowerBI
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PowerBIEmbedded\
- true
-
+ PowerBIEmbedded
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)PowerBI
+ $(LegacyAssemblyPrefix)PowerBI
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/AccountsTestRunner.cs b/src/ResourceManager/Profile/Commands.Profile.Test/AccountsTestRunner.cs
new file mode 100644
index 000000000000..2da8dce0ef4f
--- /dev/null
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/AccountsTestRunner.cs
@@ -0,0 +1,39 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.TestFx;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Profile.Test
+{
+ public class AccountsTestRunner
+ {
+ protected readonly ITestRunner TestRunner;
+
+ protected AccountsTestRunner(ITestOutputHelper output)
+ {
+ TestRunner = TestManager.CreateInstance(output)
+ .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+ .WithCommonPsScripts(new[]
+ {
+ @"Common.ps1", @"AzureRM.Resources.ps1"
+ })
+ .WithNewRmModules(helper => new[]
+ {
+ helper.RMProfileModule
+ })
+ .Build();
+ }
+ }
+}
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs
index 2a22f1ee4834..c295ed56fd79 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.cs
@@ -12,14 +12,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-using Microsoft.Azure.Commands.TestFx;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.Azure.Commands.Profile.Test
{
- public class ArgumentCompleterTests : TestRunnerBase
+ public class ArgumentCompleterTests : AccountsTestRunner
{
public ArgumentCompleterTests(ITestOutputHelper output)
: base(output)
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/DefaultCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/DefaultCmdletTests.cs
index 2601cca6c327..91129a184eac 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/DefaultCmdletTests.cs
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/DefaultCmdletTests.cs
@@ -12,17 +12,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-using Microsoft.Azure.Commands.ResourceManager.Common;
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.Azure.Commands.TestFx;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.Azure.Commands.Profile.Test
{
- public class DefaultCmdletTests : TestRunnerBase
+ public class DefaultCmdletTests : AccountsTestRunner
{
public DefaultCmdletTests(ITestOutputHelper output)
: base(output)
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs
index e5dbd55cd0f2..dbc3066028e9 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs
@@ -12,14 +12,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-using Microsoft.Azure.Commands.TestFx;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.Azure.Commands.Profile.Test
{
- public class SubscriptionCmdletTests : TestRunnerBase
+ public class SubscriptionCmdletTests : AccountsTestRunner
{
public SubscriptionCmdletTests(ITestOutputHelper output)
: base(output)
diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
index 2c16afb97393..e4eec1767419 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
+++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Accounts
- Microsoft.Azure.Commands.Profile
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Accounts\
- true
-
+ Accounts
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)Profile
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.Netcore.csproj
index 7bfa81ac6d3a..3634b5d28ad8 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Helpers
- Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
- false
- true
- true
- false
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup.Helpers
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup.Helpers
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Logger/Commands.RecoveryServices.Backup.Logger.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Logger/Commands.RecoveryServices.Backup.Logger.Netcore.csproj
index 8e363df8a914..64663a13ab36 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Logger/Commands.RecoveryServices.Backup.Logger.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Logger/Commands.RecoveryServices.Backup.Logger.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Logger
- Microsoft.Azure.Commands.RecoveryServices.Backup
- false
- true
- true
- false
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup.Logger
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.Netcore.csproj
index e174d388deb6..2feabb4eb703 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Models
- Microsoft.Azure.Commands.RecoveryServices.Backup
- false
- true
- true
- false
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup.Models
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.Netcore.csproj
index 104e1c156db8..07fe095186c2 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Providers
- Microsoft.Azure.Commands.RecoveryServices.Backup.Providers
- false
- true
- true
- false
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup.Providers
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup.Providers
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.Netcore.csproj
index b8ccc8303834..3dfbafc7d91c 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.ServiceClientAdapter
- Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter
- false
- true
- true
- false
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup.ServiceClientAdapter
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup.ServiceClientAdapter
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.Netcore.csproj
index 3e0f4a176278..626e3ffcf2e4 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup
- Microsoft.Azure.Commands.RecoveryServices.Backup
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).Backup
+ $(LegacyAssemblyPrefix)$(PsModuleName).Backup
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Netcore.csproj
index 296e82185863..469e24e8b747 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.SiteRecovery
- Microsoft.Azure.Commands.RecoveryServices.SiteRecovery
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).SiteRecovery
+ $(LegacyAssemblyPrefix)$(PsModuleName).SiteRecovery
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.Netcore.csproj
index ca48cffad863..19c69a7483f0 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.ARM
- Microsoft.Azure.Commands.RecoveryServices
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\
- true
-
+ RecoveryServices
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)$(PsModuleName).ARM
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.Netcore.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.Netcore.csproj
index 66c123c9ec21..e24085220abd 100644
--- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.Netcore.csproj
+++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.RedisCache
- Microsoft.Azure.Commands.RedisCache
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RedisCache\
- true
-
+ RedisCache
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Relay/Commands.Relay/Commands.Relay.Netcore.csproj b/src/ResourceManager/Relay/Commands.Relay/Commands.Relay.Netcore.csproj
index fb65edab8274..75bee229d6a7 100644
--- a/src/ResourceManager/Relay/Commands.Relay/Commands.Relay.Netcore.csproj
+++ b/src/ResourceManager/Relay/Commands.Relay/Commands.Relay.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Relay
- Microsoft.Azure.Commands.Relay
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Relay\
- true
-
+ Relay
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj b/src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj
index 4ab995052de4..37ef1a7621c6 100644
--- a/src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj
+++ b/src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Reservations
- Microsoft.Azure.Commands.Reservations
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Reservations\
- true
-
+ Reservations
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Commands.ResourceGraph.Netcore.csproj b/src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Commands.ResourceGraph.Netcore.csproj
index 9e903f071407..3ddb12498174 100644
--- a/src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Commands.ResourceGraph.Netcore.csproj
+++ b/src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Commands.ResourceGraph.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph
- Microsoft.Azure.Commands.ResourceGraph
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ResourceGraph\
- true
-
+ ResourceGraph
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.Netcore.csproj b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.Netcore.csproj
index 47bf7c5cadfe..be75d669c5dd 100644
--- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.Netcore.csproj
+++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ResourceManager
- Microsoft.Azure.Commands.ResourceManager.Cmdlets
- false
- true
- false
- $(ProjectDir)..\..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Resources\
- true
-
+ Resources
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)ResourceManager
+ $(LegacyAssemblyPrefix)ResourceManager.Cmdlets
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTestRunner.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTestRunner.cs
index ad46e5f1686d..77421b62b129 100644
--- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTestRunner.cs
+++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTestRunner.cs
@@ -35,7 +35,7 @@ public class ResourceTestRunner
protected ResourceTestRunner(ITestOutputHelper output)
{
- TestRunner = TestFx.TestManager.CreateInstance(output)
+ TestRunner = TestManager.CreateInstance(output)
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
.WithProjectSubfolderForTests("ScenarioTests")
.WithCommonPsScripts(new[]
@@ -44,7 +44,8 @@ protected ResourceTestRunner(ITestOutputHelper output)
})
.WithExtraRmModules(helper => new[]
{
- helper.GetRMModulePath("AzureRM.Monitor.psd1"),
+ helper.RMResourceModule,
+ helper.GetRMModulePath("AzureRM.Monitor.psd1")
})
.WithRecordMatcher(
(ignoreResourcesClient, resourceProviders, userAgentsToIgnore) =>
diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.Netcore.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.Netcore.csproj
index 2a27019b9400..ebf109a1f6cd 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.Netcore.csproj
+++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Resources
- Microsoft.Azure.Commands.Resources
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Resources\
- true
-
+ Resources
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Resources/Commands.Tags/Commands.Tags.Netcore.csproj b/src/ResourceManager/Resources/Commands.Tags/Commands.Tags.Netcore.csproj
index 14c1e8c4b6ca..96c609f63cf2 100644
--- a/src/ResourceManager/Resources/Commands.Tags/Commands.Tags.Netcore.csproj
+++ b/src/ResourceManager/Resources/Commands.Tags/Commands.Tags.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Tags
- Microsoft.Azure.Commands.Tags
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Resources\
- true
-
+ Resources
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Tags
+ $(LegacyAssemblyPrefix)Tags
diff --git a/src/ResourceManager/Search/Commands.Management.Search/Commands.Management.Search.Netcore.csproj b/src/ResourceManager/Search/Commands.Management.Search/Commands.Management.Search.Netcore.csproj
index 88dcf8880247..fdd714d7fe81 100644
--- a/src/ResourceManager/Search/Commands.Management.Search/Commands.Management.Search.Netcore.csproj
+++ b/src/ResourceManager/Search/Commands.Management.Search/Commands.Management.Search.Netcore.csproj
@@ -1,29 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Management.Search
- Microsoft.Azure.Commands.Management.Search
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Search\
- true
-
+ Search
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Management.$(PsModuleName)
+ $(LegacyAssemblyPrefix)Management.$(PsModuleName)
diff --git a/src/ResourceManager/Security/Commands.Security/Commands.Security.Netcore.csproj b/src/ResourceManager/Security/Commands.Security/Commands.Security.Netcore.csproj
index 89caf2f1a11c..07f207622892 100644
--- a/src/ResourceManager/Security/Commands.Security/Commands.Security.Netcore.csproj
+++ b/src/ResourceManager/Security/Commands.Security/Commands.Security.Netcore.csproj
@@ -1,30 +1,14 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.SecurityCenter
- Microsoft.Azure.Commands.SecurityCenter
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Security\
- true
-
+ Security
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)SecurityCenter
+ $(LegacyAssemblyPrefix)SecurityCenter
diff --git a/src/ResourceManager/ServiceBus/Commands.ServiceBus/Commands.ServiceBus.Netcore.csproj b/src/ResourceManager/ServiceBus/Commands.ServiceBus/Commands.ServiceBus.Netcore.csproj
index 5f5c4314a84f..06c56ac112c4 100644
--- a/src/ResourceManager/ServiceBus/Commands.ServiceBus/Commands.ServiceBus.Netcore.csproj
+++ b/src/ResourceManager/ServiceBus/Commands.ServiceBus/Commands.ServiceBus.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ServiceBus
- Microsoft.Azure.Commands.ServiceBus
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ServiceBus\
- true
-
+ ServiceBus
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj
index 5fdd2c4452b3..1dc3c2da5bf2 100644
--- a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj
+++ b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.ServiceFabric
- Microsoft.Azure.Commands.ServiceFabric
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ServiceFabric\
- true
-
+ ServiceFabric
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/SignalR/Commands.SignalR/Commands.SignalR.Netcore.csproj b/src/ResourceManager/SignalR/Commands.SignalR/Commands.SignalR.Netcore.csproj
index 005881defd68..a7a724c05839 100644
--- a/src/ResourceManager/SignalR/Commands.SignalR/Commands.SignalR.Netcore.csproj
+++ b/src/ResourceManager/SignalR/Commands.SignalR/Commands.SignalR.Netcore.csproj
@@ -1,29 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.SignalR
- Microsoft.Azure.Commands.SignalR
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.SignalR\
- true
-
+ SignalR
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj
index dbf514654bbe..53dfaf88c9e2 100644
--- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj
+++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Sql
- Microsoft.Azure.Commands.Sql
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Sql\
- true
-
+ Sql
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- ..\MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Sql/LegacySdk/SqlManagement.Netcore.csproj b/src/ResourceManager/Sql/LegacySdk/SqlManagement.Netcore.csproj
index af57fa030df3..d84bb0177343 100644
--- a/src/ResourceManager/Sql/LegacySdk/SqlManagement.Netcore.csproj
+++ b/src/ResourceManager/Sql/LegacySdk/SqlManagement.Netcore.csproj
@@ -1,40 +1,21 @@
+ Sql
true
-
-
+
+
- netstandard2.0
- Microsoft.Azure.Management.Sql.Legacy
- Microsoft.Azure.Management.Sql.Legacy
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Sql\
- true
-
+ Microsoft.Azure.Management.$(PsModuleName).Legacy
+ Microsoft.Azure.Management.$(PsModuleName).Legacy
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
- true
- true
- ..\MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
-
-
true
diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs b/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs
index ad3bbcc906ee..532c4d0a44d3 100644
--- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs
+++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs
@@ -12,9 +12,6 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-
-using Microsoft.Azure.ServiceManagement.Common.Models;
-using Microsoft.Azure.Commands.TestFx;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;
using Xunit.Abstractions;
@@ -128,9 +125,7 @@ public void TestGetAzureStorageLocationUsage()
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestPipingNewUpdateAccount()
{
- TestController.NewInstance.RunPsTest(_logger, "Test-PipingNewUpdateAccount");
+ TestRunner.RunTestScript("Test-PipingNewUpdateAccount");
}
-
-
}
}
diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageTestRunner.cs b/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageTestRunner.cs
index 468c25c919ac..a444bee9af49 100644
--- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageTestRunner.cs
+++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageTestRunner.cs
@@ -28,14 +28,12 @@ protected StorageTestRunner(ITestOutputHelper output)
.WithProjectSubfolderForTests("ScenarioTests")
.WithCommonPsScripts(new[]
{
- @"Common.ps1",
+ @"Common.ps1", @"../AzureRM.Resources.ps1"
})
- .WithExtraRmModules(helper => new[]
+ .WithNewRmModules(helper => new[]
{
-#if !NETSTANDARD
- helper.RMStorageDataPlaneModule,
-#endif
- helper.RMStorageModule,
+ helper.RMProfileModule,
+ helper.RMStorageModule
})
.Build();
}
diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj
index 6f96d404d860..769768fbeca9 100644
--- a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj
+++ b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj
@@ -1,33 +1,15 @@
+ Storage
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Management.Storage
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Storage\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(AzAssemblyPrefix)Management.$(PsModuleName)
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Storage/Commands.Storage/Commands.Storage.Netcore.csproj b/src/ResourceManager/Storage/Commands.Storage/Commands.Storage.Netcore.csproj
index 438417b19edd..91fad3e9ad4b 100644
--- a/src/ResourceManager/Storage/Commands.Storage/Commands.Storage.Netcore.csproj
+++ b/src/ResourceManager/Storage/Commands.Storage/Commands.Storage.Netcore.csproj
@@ -1,34 +1,14 @@
+ Storage
true
-
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Storage
- Microsoft.WindowsAzure.Commands.Storage
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Storage\
- true
-
-
+
-
- false
- TRACE;DEBUG;NETSTANDARD
-
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ Microsoft.WindowsAzure.Commands.$(PsModuleName)
diff --git a/src/ResourceManager/StorageSync/Commands.StorageSync/Commands.StorageSync.Netcore.csproj b/src/ResourceManager/StorageSync/Commands.StorageSync/Commands.StorageSync.Netcore.csproj
index f1a498694442..0922ead6b88c 100644
--- a/src/ResourceManager/StorageSync/Commands.StorageSync/Commands.StorageSync.Netcore.csproj
+++ b/src/ResourceManager/StorageSync/Commands.StorageSync/Commands.StorageSync.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.StorageSync
- Microsoft.Azure.Commands.StorageSync
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.StorageSync\
- true
-
+ StorageSync
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.Netcore.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.Netcore.csproj
index 62e6ce06582a..97eb06b1e41e 100644
--- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.Netcore.csproj
+++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.StreamAnalytics
- Microsoft.Azure.Commands.StreamAnalytics
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.StreamAnalytics\
- true
-
+ StreamAnalytics
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.Netcore.csproj b/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.Netcore.csproj
index 56af7b0aba8f..73ef00b2bc14 100644
--- a/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.Netcore.csproj
+++ b/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Subscription
- Microsoft.Azure.Commands.Subscription
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Subscription\
- true
-
+ Subscription
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.Netcore.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.Netcore.csproj
index f5c1e2573212..31d4959de248 100644
--- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.Netcore.csproj
+++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.TrafficManager
- Microsoft.Azure.Commands.TrafficManager
- false
- true
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.TrafficManager\
- true
-
+ TrafficManager
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)$(PsModuleName)
diff --git a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.Netcore.csproj b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.Netcore.csproj
index c6351e032287..366c4a2ba7fe 100644
--- a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.Netcore.csproj
+++ b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.Netcore.csproj
@@ -1,30 +1,13 @@
-
-
- netstandard2.0
- Microsoft.Azure.PowerShell.Cmdlets.Websites
- Microsoft.Azure.Commands.WebApps
- false
- true
- false
- $(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Websites\
- true
-
+ Websites
-
- false
- TRACE;DEBUG;NETSTANDARD
-
+
-
-
- true
- true
- MSSharedLibKey.snk
- TRACE;RELEASE;NETSTANDARD;SIGN
+
+ $(LegacyAssemblyPrefix)WebApps