Skip to content

11: Update module & Common DLL names #8034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 7, 2018
Merged

11: Update module & Common DLL names #8034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34506db
Minor change to build.proj to not show warnings if it cannot delete f…
MiYanni Dec 5, 2018
4ef5ba3
Updated DLL names/paths for Az StaticAnalysis exceptions. Removed ful…
MiYanni Dec 5, 2018
498d960
Fixed StorageSync resource loading issue. Fixed warning output when c…
MiYanni Dec 6, 2018
45c9ef5
Updated Common packages to use versions with updated DLL names. Updat…
MiYanni Dec 6, 2018
8fc5ef0
Merge branch 'az-cleanup' into az-cleanup-11-dllrename
cormacpayne Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@
<Message Importance="high" Text="Cleaning Cmdlets..." />

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

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

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Aks.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Aks/Commands.Aks/Az.Aks.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ TypesToProcess = @()
FormatsToProcess = @()

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

# 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.
FunctionsToExport = @()
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.Aks</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Aks</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Aks</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
135 changes: 0 additions & 135 deletions ...eManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...es/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Dataplane</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion ...ysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Az.AnalysisServices.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
# FormatsToProcess = @()

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

# 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.
FunctionsToExport = @()
Expand Down
2 changes: 1 addition & 1 deletion ...nager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion ...s.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion ...ager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/ApiManagement/Commands.ApiManagement/Az.ApiManagement.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.ApiManage
# FormatsToProcess = @()

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

# 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.
FunctionsToExport = @()
Expand Down
2 changes: 1 addition & 1 deletion ...esourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.ApiManagement</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApiManagement</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion ...nagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion ...sights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion ...ourceManager/ApplicationInsights/Commands.ApplicationInsights/Az.ApplicationInsights.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'
FormatsToProcess = '.\Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml'

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

# 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.
FunctionsToExport = @()
Expand Down
2 changes: 1 addition & 1 deletion ...licationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion ...sourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.Automation.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Automation.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Automation.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Automation/Commands.Automation/Az.Automation.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll'
FormatsToProcess = @(".\AzureRM.Automation.format.ps1xml")

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

# 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.
FunctionsToExport = @()
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Commands.Automation</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Automation</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Automation</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
[assembly: AssemblyVersion("6.1.0")]
[assembly: AssemblyFileVersion("6.1.0")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Automation.Test")]
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test")]
#endif
[assembly: CLSCompliant(false)]
0 ...ResourceManager/AzureBatch/AzureBatch.sln → src/ResourceManager/AzureBatch/Batch.sln
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
<AssemblyName>Microsoft.Azure.Commands.Batch.Test</AssemblyName>
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Batch.Test</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Batch.Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
Loading