Skip to content

Commit 105f9fd

Browse files
authored
Merge pull request #7618 from MiYanni/automation-dll-rename
Automation DLL rename
2 parents c4e8680 + c2b3b01 commit 105f9fd

23 files changed

+53861
-53856
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.Commands.ResourceManager.Automation.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>
7+
<AssemblyName>Microsoft.Azure.Commands.Automation.Test</AssemblyName>
8+
<RootNamespace>Microsoft.Azure.Commands.Automation.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<WarningsAsErrors />
@@ -35,7 +35,7 @@
3535

3636
<ItemGroup>
3737
<Reference Include="Microsoft.Azure.Commands.Automation">
38-
<HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll</HintPath>
38+
<HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Automation\Microsoft.Azure.Commands.Automation.dll</HintPath>
3939
</Reference>
4040
</ItemGroup>
4141

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ProjectGuid>{59D1B5DC-9175-43EC-90C6-CBA601B3565F}</ProjectGuid>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>
15-
<AssemblyName>Microsoft.Azure.Commands.ResourceManager.Automation.Test</AssemblyName>
14+
<RootNamespace>Microsoft.Azure.Commands.Automation.Test</RootNamespace>
15+
<AssemblyName>Microsoft.Azure.Commands.Automation.Test</AssemblyName>
1616
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

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 = @()
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.ResourceManager.Automation.dll')
69+
NestedModules = @('.\Microsoft.Azure.Commands.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/AzureRM.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 = @()
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.ResourceManager.Automation.dll')
69+
NestedModules = @('.\Microsoft.Azure.Commands.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/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Renamed cmdlet DLL filename to Microsoft.Azure.Commands.Automation.dll
2122

2223
## Version 5.1.1
2324
* Fixed issue with default resource groups not being set.

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.ResourceManager.Automation</AssemblyName>
7+
<AssemblyName>Microsoft.Azure.Commands.Automation</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Automation</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Microsoft.Azure.Commands.Automation</RootNamespace>
12-
<AssemblyName>Microsoft.Azure.Commands.ResourceManager.Automation</AssemblyName>
12+
<AssemblyName>Microsoft.Azure.Commands.Automation</AssemblyName>
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

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("5.1.1")]
4747
[assembly: AssemblyFileVersion("5.1.1")]
4848
#if SIGN
49-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
49+
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else
51-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test")]
51+
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test")]
5252
#endif
5353
[assembly: CLSCompliant(false)]

src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ProjectGuid>{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}</ProjectGuid>
1111
<OutputType>Library</OutputType>
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
13-
<RootNamespace>Microsoft.Azure.Commands.Automation.Test</RootNamespace>
14-
<AssemblyName>Microsoft.Azure.Commands.Automation.Test</AssemblyName>
13+
<RootNamespace>Microsoft.WindowsAzure.Commands.Automation.Test</RootNamespace>
14+
<AssemblyName>Microsoft.WindowsAzure.Commands.Automation.Test</AssemblyName>
1515
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1616
<FileAlignment>512</FileAlignment>
1717
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<ProjectGuid>{47CD7E95-5330-4384-ABCE-2C267C57085C}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Microsoft.Azure.Commands.Automation</RootNamespace>
12-
<AssemblyName>Microsoft.Azure.Commands.Automation</AssemblyName>
11+
<RootNamespace>Microsoft.WindowsAzure.Commands.Automation</RootNamespace>
12+
<AssemblyName>Microsoft.WindowsAzure.Commands.Automation</AssemblyName>
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -140,7 +140,7 @@
140140
<Compile Include="Common\RequestSettings.cs" />
141141
</ItemGroup>
142142
<ItemGroup>
143-
<Content Include="Microsoft.Azure.Commands.Automation.dll-help.xml">
143+
<Content Include="Microsoft.WindowsAzure.Commands.Automation.dll-help.xml">
144144
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
145145
</Content>
146146
</ItemGroup>

src/ServiceManagement/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("5.3.0")]
4747
[assembly: AssemblyFileVersion("5.3.0")]
4848
#if SIGN
49-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
49+
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else
51-
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test")]
51+
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Automation.Test")]
5252
#endif
5353
[assembly: CLSCompliant(false)]

src/ServiceManagement/Azure.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ FormatsToProcess =
7878
'.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml'
7979

8080
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
81-
NestedModules = @('.\Automation\Microsoft.Azure.Commands.Automation.dll',
81+
NestedModules = @('.\Automation\Microsoft.WindowsAzure.Commands.Automation.dll',
8282
'.\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.dll',
8383
'.\HDInsight\Microsoft.WindowsAzure.Commands.HDInsight.dll',
8484
'.\Networking\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.dll',

tools/CredScanSuppressions.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,10 @@
716716
{
717717
"file": "\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\SessionRecords\\Microsoft.Azure.Commands.ApplicationInsights.Test.ScenarioTests.PricingAndDailyCapTests\\TestSetAppInsightsDailyCap.json",
718718
"_justification": "Legitimate test session record"
719+
},
720+
{
721+
"file": "\\src\\ServiceManagement\\Automation\\Commands.Automation\\Microsoft.WindowsAzure.Commands.Automation.dll-help.xml",
722+
"_justification": "Module example help information using fake passwords"
719723
}
720724
]
721725
}

tools/Docs/Add-AzureHelpKeywords.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $Common = @{
2626
$RM = @{
2727
"ResourceManager\ApiManagement\Commands.ApiManagement.ServiceManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.xml" = @("api", "apimanagement", "apimgmt", "apism")
2828
"ResourceManager\ApiManagement\Commands.ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll-help.xml" = @("api", "apimanagement", "apimgmt", "apirm")
29-
"ResourceManager\Automation\Commands.Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll-help.xml" = @("automation", "devops")
29+
"ResourceManager\Automation\Commands.Automation\Microsoft.Azure.Commands.Automation.dll-help.xml" = @("automation", "devops")
3030
"ResourceManager\AzureBackup\Commands.AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll-help.xml" = @("backup")
3131
"ResourceManager\AzureBatch\Commands.Batch\Microsoft.Azure.Commands.Batch.dll-Help.xml" = @("batch")
3232
"ResourceManager\Compute\Commands.Compute\Microsoft.Azure.Commands.Compute.dll-Help.xml" = @("compute", "vm", "iaas")
@@ -53,7 +53,7 @@ $RM = @{
5353

5454
# specialized Service Management keywords by module
5555
$SM = @{
56-
"ServiceManagement\Automation\Commands.Automation\Microsoft.Azure.Commands.Automation.dll-help.xml" = @("automation", "devops")
56+
"ServiceManagement\Automation\Commands.Automation\Microsoft.WindowsAzure.Commands.Automation.dll-help.xml" = @("automation", "devops")
5757
"ServiceManagement\Compute\Commands.ServiceManagement.PlatformImageRepository\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-help.xml" = @("image", "vm", "platform")
5858
"ServiceManagement\Compute\Commands.ServiceManagement.Preview\Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll-Help.xml" = @("preview")
5959
"ServiceManagement\Compute\Commands.ServiceManagement\Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml" = @("svc", "mgmt", "service")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation"
2-
"Microsoft.Azure.Commands.ResourceManager.Automation.dll","Microsoft.Azure.Commands.Automation.Cmdlet.RemoveAzureAutomationVariable","Remove-AzureRmAutomationVariable","0","1020","The cmdlet 'Remove-AzureRmAutomationVariable' no longer has output type 'Microsoft.Azure.Commands.Automation.Model.Variable'.","Make cmdlet 'Remove-AzureRmAutomationVariable' return type 'Microsoft.Azure.Commands.Automation.Model.Variable'."
3-
"Microsoft.Azure.Commands.ResourceManager.Automation.dll","Microsoft.Azure.Commands.Automation.Cmdlet.GetAzureAutomationHybridWorkerGroup","Get-AzureRMAutomationHybridWorkerGroup","0","1000","The cmdlet 'Get-AzureRMAutomationHybridWorkerGroup' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'Get-AzureRMAutomationHybridWorkerGroup' back to the module, or add an alias to the original cmdlet name."
2+
"Microsoft.Azure.Commands.Automation.dll","Microsoft.Azure.Commands.Automation.Cmdlet.RemoveAzureAutomationVariable","Remove-AzureRmAutomationVariable","0","1020","The cmdlet 'Remove-AzureRmAutomationVariable' no longer has output type 'Microsoft.Azure.Commands.Automation.Model.Variable'.","Make cmdlet 'Remove-AzureRmAutomationVariable' return type 'Microsoft.Azure.Commands.Automation.Model.Variable'."
3+
"Microsoft.Azure.Commands.Automation.dll","Microsoft.Azure.Commands.Automation.Cmdlet.GetAzureAutomationHybridWorkerGroup","Get-AzureRMAutomationHybridWorkerGroup","0","1000","The cmdlet 'Get-AzureRMAutomationHybridWorkerGroup' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'Get-AzureRMAutomationHybridWorkerGroup' back to the module, or add an alias to the original cmdlet name."

0 commit comments

Comments
 (0)