Skip to content

Commit e40a0fd

Browse files
markcowlmarkcowl
authored
Merge pull request #8034 from MiYanni/az-cleanup-11-dllrename
11: Update module & Common DLL names
2 parents b9d568b + 8fc5ef0 commit e40a0fd

File tree

398 files changed

+2457
-3178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

398 files changed

+2457
-3178
lines changed

‎build.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@
131131
<Message Importance="high" Text="Cleaning Cmdlets..." />
132132

133133
<!-- Clean out the NuGet cache -->
134-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path (Join-Path ($env:USERPROFILE) .nuget packages) -Recurse -Force&quot;" ContinueOnError="WarnAndContinue" />
134+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path (Join-Path ($env:USERPROFILE) .nuget packages) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
135135

136136
<!-- Remove Package, Publish, bin, obj, and TestResults directories -->
137-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path $(PackageDirectory),$(PublishDirectory) -Recurse -Force&quot;" ContinueOnError="WarnAndContinue" />
138-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(MSBuildThisFileDirectory) -Recurse -Include 'bin','obj','TestResults' | Remove-Item -Recurse -Force&quot;" ContinueOnError="WarnAndContinue" />
137+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path $(PackageDirectory),$(PublishDirectory) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
138+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(MSBuildThisFileDirectory) -Recurse -Include 'bin','obj','TestResults' | Remove-Item -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
139139
</Target>
140140

141141
<PropertyGroup>

‎src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Aks.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/Aks/Commands.Aks/Az.Aks.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ TypesToProcess = @()
6666
FormatsToProcess = @()
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.Aks.dll')
69+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.Aks.dll')
7070

7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = @()

‎src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.Aks</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Aks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Aks</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Dataplane</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Az.AnalysisServices.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
6666
# FormatsToProcess = @()
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.AnalysisServices.dll', '.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll')
69+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.dll', '.\Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Dataplane.dll')
7070

7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = @()

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Az.ApiManagement.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.ApiManage
6767
# FormatsToProcess = @()
6868

6969
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
70-
NestedModules = @('.\Microsoft.Azure.Commands.ApiManagement.dll',
71-
'.\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll')
70+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.dll',
71+
'.\Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement.dll')
7272

7373
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7474
FunctionsToExport = @()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<PropertyGroup>
1010
<TargetFramework>netstandard2.0</TargetFramework>
11-
<AssemblyName>Microsoft.Azure.Commands.ApiManagement</AssemblyName>
11+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement</AssemblyName>
1212
<RootNamespace>Microsoft.Azure.Commands.ApiManagement</RootNamespace>
1313
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Az.ApplicationInsights.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'
6666
FormatsToProcess = '.\Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml'
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.ApplicationInsights.dll')
69+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.dll')
7070

7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = @()

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.Automation.Test</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Automation.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Automation.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/ResourceManager/Automation/Commands.Automation/Az.Automation.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll'
6666
FormatsToProcess = @(".\AzureRM.Automation.format.ps1xml")
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.Automation.dll')
69+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.Automation.dll')
7070

7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = @()

‎src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<AssemblyName>Microsoft.Azure.Commands.Automation</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Automation</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Automation</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
[assembly: AssemblyVersion("6.1.0")]
4747
[assembly: AssemblyFileVersion("6.1.0")]
4848
#if SIGN
49-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
49+
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else
51-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test")]
51+
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test")]
5252
#endif
5353
[assembly: CLSCompliant(false)]

‎src/ResourceManager/AzureBatch/AzureBatch.sln renamed to ‎src/ResourceManager/AzureBatch/Batch.sln

File renamed without changes.

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<PropertyGroup>
1010
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
11-
<AssemblyName>Microsoft.Azure.Commands.Batch.Test</AssemblyName>
11+
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Batch.Test</AssemblyName>
1212
<RootNamespace>Microsoft.Azure.Commands.Batch.Test</RootNamespace>
1313
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1414
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

0 commit comments

Comments
 (0)