Skip to content

Commit 0bc291f

Browse files
markcowlmarkcowl
authored
Merge pull request #5829 from MiYanni/NetCoreStorage
NetCore Storage changes
2 parents 4bb1d37 + 39c52f7 commit 0bc291f

26 files changed

+780
-443
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RedisCache.Netcore
175175
EndProject
176176
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AnalysisServices.Dataplane.Netcore", "src\ResourceManager\AnalysisServices\Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.Netcore.csproj", "{F172B347-4B1F-4888-A5B9-3D05303C0E6F}"
177177
EndProject
178+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore", "src\Storage\Commands.Storage\Commands.Storage.Netcore.csproj", "{4F18000A-0329-4450-ADC8-8AA1C04A4666}"
179+
EndProject
178180
Global
179181
GlobalSection(SolutionConfigurationPlatforms) = preSolution
180182
Debug|Any CPU = Debug|Any CPU
@@ -1205,6 +1207,18 @@ Global
12051207
{F172B347-4B1F-4888-A5B9-3D05303C0E6F}.Release|x64.Build.0 = Release|Any CPU
12061208
{F172B347-4B1F-4888-A5B9-3D05303C0E6F}.Release|x86.ActiveCfg = Release|Any CPU
12071209
{F172B347-4B1F-4888-A5B9-3D05303C0E6F}.Release|x86.Build.0 = Release|Any CPU
1210+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1211+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|Any CPU.Build.0 = Debug|Any CPU
1212+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|x64.ActiveCfg = Debug|Any CPU
1213+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|x64.Build.0 = Debug|Any CPU
1214+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|x86.ActiveCfg = Debug|Any CPU
1215+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Debug|x86.Build.0 = Debug|Any CPU
1216+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|Any CPU.ActiveCfg = Release|Any CPU
1217+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|Any CPU.Build.0 = Release|Any CPU
1218+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x64.ActiveCfg = Release|Any CPU
1219+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x64.Build.0 = Release|Any CPU
1220+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.ActiveCfg = Release|Any CPU
1221+
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.Build.0 = Release|Any CPU
12081222
EndGlobalSection
12091223
GlobalSection(SolutionProperties) = preSolution
12101224
HideSolutionNode = FALSE

‎src/Common/Commands.Common/AzureDataCmdlet.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,24 @@ protected override void ConfirmAction(bool force, string continueMessage, string
7878
ConfirmAction(force, continueMessage, processMessage, target, action, () => true);
7979
}
8080

81-
#if !NETSTANDARD
8281
public IAzureContextContainer SMProfile
8382
{
8483
get
8584
{
85+
#if NETSTANDARD
86+
return null;
87+
#else
8688
IAzureContextContainer result = null;
8789
if (AzureSMProfileProvider.Instance != null)
8890
{
8991
result = AzureSMProfileProvider.Instance.Profile;
9092
}
9193

9294
return result;
95+
#endif
9396
}
9497
}
95-
#endif
98+
9699

97100
protected override string DataCollectionWarning
98101
{

‎src/ResourceManager/Compute/AzureRM.Compute.Netcore.psd1

Lines changed: 99 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -77,107 +77,110 @@ NestedModules = @('.\Microsoft.Azure.Commands.Compute.dll')
7777
FunctionsToExport = @()
7878

7979
# Cmdlets 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 cmdlets to export.
80-
CmdletsToExport = 'Remove-AzureRmAvailabilitySet', 'Get-AzureRmAvailabilitySet',
81-
'New-AzureRmAvailabilitySet', 'Update-AzureRmAvailabilitySet',
82-
'Get-AzureRmVMExtensionImageType', 'Get-AzureRmVMExtensionImage',
83-
'Get-AzureRmVMADDomainExtension', 'Set-AzureRmVMADDomainExtension',
84-
'Get-AzureRmVMAEMExtension', 'Remove-AzureRmVMAEMExtension',
85-
'Set-AzureRmVMAEMExtension', 'Test-AzureRmVMAEMExtension',
86-
'Set-AzureRmVMBginfoExtension',
87-
'Get-AzureRmVMCustomScriptExtension',
88-
'Remove-AzureRmVMCustomScriptExtension',
89-
'Set-AzureRmVMCustomScriptExtension',
90-
'Get-AzureRmVMDiagnosticsExtension',
91-
'Remove-AzureRmVMDiagnosticsExtension',
92-
'Remove-AzureRmVmssDiagnosticsExtension',
93-
'Set-AzureRmVMDiagnosticsExtension', 'Set-AzureRmVMExtension',
94-
'Remove-AzureRmVMExtension', 'Get-AzureRmVMExtension',
95-
'Get-AzureRmVMSqlServerExtension',
96-
'New-AzureRmVMSqlServerAutoBackupConfig',
97-
'New-AzureRmVMSqlServerAutoPatchingConfig',
98-
'New-AzureRmVMSqlServerKeyVaultCredentialConfig',
99-
'Remove-AzureRmVMSqlServerExtension',
100-
'Set-AzureRmVMSqlServerExtension', 'Get-AzureRmVMImage',
101-
'Get-AzureRmVMAccessExtension', 'Remove-AzureRmVMAccessExtension',
102-
'Set-AzureRmVMAccessExtension', 'Get-AzureRmVMImageSku',
103-
'Get-AzureRmVMImagePublisher', 'Get-AzureRmVMImageOffer',
104-
'Get-AzureRmRemoteDesktopFile', 'Get-AzureRmVMUsage',
105-
'Get-AzureRmVMSize', 'Save-AzureRmVMImage', 'Set-AzureRmVM',
106-
'Add-AzureRmVMAdditionalUnattendContent',
107-
'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret',
108-
'Remove-AzureRmVMSecret', 'Remove-AzureRmVMNetworkInterface',
109-
'Remove-AzureRmVMDataDisk', 'Set-AzureRmVMBootDiagnostics',
110-
'Set-AzureRmVMDataDisk', 'Set-AzureRmVMPlan',
111-
'Set-AzureRmVMSourceImage', 'Set-AzureRmVMOSDisk',
112-
'Get-AzureRmVMBootDiagnosticsData', 'Get-AzureRmVM',
113-
'Update-AzureRmVM', 'Restart-AzureRmVM', 'New-AzureRmVM',
114-
'Start-AzureRmVM', 'Stop-AzureRmVM', 'Remove-AzureRmVM',
115-
'New-AzureRmVMConfig', 'Set-AzureRmVMOperatingSystem',
116-
'Add-AzureRmVMDataDisk', 'Add-AzureRmVMNetworkInterface',
117-
'Add-AzureRmVhd', 'Save-AzureRmVhd',
118-
'Add-AzureRmContainerServiceAgentPoolProfile',
119-
'New-AzureRmContainerServiceConfig',
120-
'Remove-AzureRmContainerServiceAgentPoolProfile',
121-
'New-AzureRmContainerService', 'Update-AzureRmContainerService',
122-
'Remove-AzureRmContainerService', 'Get-AzureRmContainerService',
123-
'Get-AzureRmVmssVM', 'Set-AzureRmVmssVM',
124-
'Add-AzureRmVmssAdditionalUnattendContent',
125-
'Add-AzureRmVmssExtension', 'Add-AzureRmVmssDataDisk',
126-
'Add-AzureRmVmssNetworkInterfaceConfiguration',
127-
'Add-AzureRmVmssSecret', 'Add-AzureRmVmssSshPublicKey',
128-
'Add-AzureRmVmssWinRMListener', 'New-AzureRmVmssConfig',
129-
'New-AzureRmVmssIpConfig', 'New-AzureRmVmssVaultCertificateConfig',
130-
'Remove-AzureRmVmssExtension', 'Remove-AzureRmVmssDataDisk',
131-
'Remove-AzureRmVmssNetworkInterfaceConfiguration',
132-
'Set-AzureRmVmssOsProfile', 'Set-AzureRmVmssStorageProfile',
133-
'New-AzureRmVmss', 'Update-AzureRmVmss', 'Stop-AzureRmVmss',
134-
'Remove-AzureRmVmss', 'Get-AzureRmVmss', 'Get-AzureRmVmssSku',
135-
'Set-AzureRmVmss', 'Restart-AzureRmVmss', 'Start-AzureRmVmss',
136-
'Update-AzureRmVmssInstance', 'Get-AzureRmVMDscExtensionStatus',
137-
'Publish-AzureRmVMDscConfiguration', 'Remove-AzureRmVMDscExtension',
138-
'Set-AzureRmVMDscExtension', 'Get-AzureRmVMDscExtension',
139-
'Add-AzureRmVmssDiagnosticsExtension', 'Get-AzureRmVMChefExtension',
140-
'Remove-AzureRmVMChefExtension', 'Set-AzureRmVMChefExtension',
141-
'Remove-AzureRmVMBackup', 'Disable-AzureRmVMDiskEncryption',
142-
'Get-AzureRmVMDiskEncryptionStatus',
143-
'Remove-AzureRmVMDiskEncryptionExtension',
144-
'Set-AzureRmVMDiskEncryptionExtension',
145-
'Set-AzureRmVMBackupExtension', 'New-AzureRmDisk',
146-
'Update-AzureRmDisk', 'Get-AzureRmDisk', 'Remove-AzureRmDisk',
147-
'Grant-AzureRmDiskAccess', 'Revoke-AzureRmDiskAccess',
148-
'New-AzureRmDiskConfig', 'Set-AzureRmDiskDiskEncryptionKey',
149-
'Set-AzureRmDiskImageReference', 'Set-AzureRmDiskKeyEncryptionKey',
150-
'New-AzureRmDiskUpdateConfig',
151-
'Set-AzureRmDiskUpdateDiskEncryptionKey',
152-
'Set-AzureRmDiskUpdateImageReference',
153-
'Set-AzureRmDiskUpdateKeyEncryptionKey', 'New-AzureRmSnapshot',
154-
'Update-AzureRmSnapshot', 'Get-AzureRmSnapshot',
155-
'Remove-AzureRmSnapshot', 'Grant-AzureRmSnapshotAccess',
156-
'Revoke-AzureRmSnapshotAccess', 'New-AzureRmSnapshotConfig',
157-
'Set-AzureRmSnapshotDiskEncryptionKey',
158-
'Set-AzureRmSnapshotImageReference',
159-
'Set-AzureRmSnapshotKeyEncryptionKey',
160-
'New-AzureRmSnapshotUpdateConfig',
161-
'Set-AzureRmSnapshotUpdateDiskEncryptionKey',
162-
'Set-AzureRmSnapshotUpdateImageReference',
163-
'Set-AzureRmSnapshotUpdateKeyEncryptionKey', 'New-AzureRmImage',
164-
'Update-AzureRmImage', 'Get-AzureRmImage', 'Remove-AzureRmImage',
165-
'New-AzureRmImageConfig', 'Set-AzureRmImageOsDisk',
166-
'Add-AzureRmImageDataDisk', 'Remove-AzureRmImageDataDisk',
167-
'ConvertTo-AzureRmVMManagedDisk', 'Set-AzureRmVmssBootDiagnostic',
168-
'Get-AzureRmComputeResourceSku', 'Get-AzureRmVMRunCommandDocument',
169-
'Invoke-AzureRmVMRunCommand', 'Start-AzureRmVmssRollingOSUpgrade',
170-
'Stop-AzureRmVmssRollingUpgrade', 'Get-AzureRmVmssRollingUpgrade',
171-
'Set-AzureRmVmssRollingUpgradePolicy',
172-
'Set-AzureRmVmssDiskEncryptionExtension',
173-
'Disable-AzureRmVmssDiskEncryption',
174-
'Get-AzureRmVmssDiskEncryption', 'Get-AzureRmVmssVMDiskEncryption'
80+
CmdletsToExport = 'Remove-AzureRmAvailabilitySet', 'Get-AzureRmAvailabilitySet',
81+
'New-AzureRmAvailabilitySet', 'Update-AzureRmAvailabilitySet',
82+
'Get-AzureRmVMExtensionImageType', 'Get-AzureRmVMExtensionImage',
83+
'Get-AzureRmVMADDomainExtension', 'Set-AzureRmVMADDomainExtension',
84+
'Get-AzureRmVMAEMExtension', 'Remove-AzureRmVMAEMExtension',
85+
'Set-AzureRmVMAEMExtension', 'Test-AzureRmVMAEMExtension',
86+
'Set-AzureRmVMBginfoExtension',
87+
'Get-AzureRmVMCustomScriptExtension',
88+
'Remove-AzureRmVMCustomScriptExtension',
89+
'Set-AzureRmVMCustomScriptExtension',
90+
'Get-AzureRmVMDiagnosticsExtension',
91+
'Remove-AzureRmVMDiagnosticsExtension',
92+
'Remove-AzureRmVmssDiagnosticsExtension',
93+
'Set-AzureRmVMDiagnosticsExtension', 'Set-AzureRmVMExtension',
94+
'Remove-AzureRmVMExtension', 'Get-AzureRmVMExtension',
95+
'Get-AzureRmVMSqlServerExtension',
96+
'New-AzureRmVMSqlServerAutoBackupConfig',
97+
'New-AzureRmVMSqlServerAutoPatchingConfig',
98+
'New-AzureRmVMSqlServerKeyVaultCredentialConfig',
99+
'Remove-AzureRmVMSqlServerExtension',
100+
'Set-AzureRmVMSqlServerExtension', 'Get-AzureRmVMImage',
101+
'Get-AzureRmVMAccessExtension', 'Remove-AzureRmVMAccessExtension',
102+
'Set-AzureRmVMAccessExtension', 'Get-AzureRmVMImageSku',
103+
'Get-AzureRmVMImagePublisher', 'Get-AzureRmVMImageOffer',
104+
'Get-AzureRmRemoteDesktopFile', 'Get-AzureRmVMUsage',
105+
'Get-AzureRmVMSize', 'Save-AzureRmVMImage', 'Set-AzureRmVM',
106+
'Add-AzureRmVMAdditionalUnattendContent',
107+
'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret',
108+
'Remove-AzureRmVMSecret', 'Remove-AzureRmVMNetworkInterface',
109+
'Remove-AzureRmVMDataDisk', 'Set-AzureRmVMBootDiagnostics',
110+
'Set-AzureRmVMDataDisk', 'Set-AzureRmVMPlan',
111+
'Set-AzureRmVMSourceImage', 'Set-AzureRmVMOSDisk',
112+
'Get-AzureRmVMBootDiagnosticsData', 'Get-AzureRmVM',
113+
'Update-AzureRmVM', 'Restart-AzureRmVM', 'New-AzureRmVM',
114+
'Start-AzureRmVM', 'Stop-AzureRmVM', 'Remove-AzureRmVM',
115+
'New-AzureRmVMConfig', 'Set-AzureRmVMOperatingSystem',
116+
'Add-AzureRmVMDataDisk', 'Add-AzureRmVMNetworkInterface',
117+
'Add-AzureRmVhd', 'Save-AzureRmVhd',
118+
'Add-AzureRmContainerServiceAgentPoolProfile',
119+
'New-AzureRmContainerServiceConfig',
120+
'Remove-AzureRmContainerServiceAgentPoolProfile',
121+
'New-AzureRmContainerService', 'Update-AzureRmContainerService',
122+
'Remove-AzureRmContainerService', 'Get-AzureRmContainerService',
123+
'Get-AzureRmVmssVM', 'Set-AzureRmVmssVM',
124+
'Add-AzureRmVmssAdditionalUnattendContent',
125+
'Add-AzureRmVmssExtension', 'Add-AzureRmVmssDataDisk',
126+
'Add-AzureRmVmssNetworkInterfaceConfiguration',
127+
'Add-AzureRmVmssSecret', 'Add-AzureRmVmssSshPublicKey',
128+
'Add-AzureRmVmssWinRMListener', 'New-AzureRmVmssConfig',
129+
'New-AzureRmVmssIpConfig', 'New-AzureRmVmssVaultCertificateConfig',
130+
'Remove-AzureRmVmssExtension', 'Remove-AzureRmVmssDataDisk',
131+
'Remove-AzureRmVmssNetworkInterfaceConfiguration',
132+
'Set-AzureRmVmssOsProfile', 'Set-AzureRmVmssStorageProfile',
133+
'New-AzureRmVmss', 'Update-AzureRmVmss', 'Stop-AzureRmVmss',
134+
'Remove-AzureRmVmss', 'Get-AzureRmVmss', 'Get-AzureRmVmssSku',
135+
'Set-AzureRmVmss', 'Restart-AzureRmVmss', 'Start-AzureRmVmss',
136+
'Update-AzureRmVmssInstance', 'Get-AzureRmVMDscExtensionStatus',
137+
'Publish-AzureRmVMDscConfiguration', 'Remove-AzureRmVMDscExtension',
138+
'Set-AzureRmVMDscExtension', 'Get-AzureRmVMDscExtension',
139+
'Add-AzureRmVmssDiagnosticsExtension', 'Get-AzureRmVMChefExtension',
140+
'Remove-AzureRmVMChefExtension', 'Set-AzureRmVMChefExtension',
141+
'Remove-AzureRmVMBackup', 'Disable-AzureRmVMDiskEncryption',
142+
'Get-AzureRmVMDiskEncryptionStatus',
143+
'Remove-AzureRmVMDiskEncryptionExtension',
144+
'Set-AzureRmVMDiskEncryptionExtension',
145+
'Set-AzureRmVMBackupExtension', 'New-AzureRmDisk',
146+
'Update-AzureRmDisk', 'Get-AzureRmDisk', 'Remove-AzureRmDisk',
147+
'Grant-AzureRmDiskAccess', 'Revoke-AzureRmDiskAccess',
148+
'New-AzureRmDiskConfig', 'Set-AzureRmDiskDiskEncryptionKey',
149+
'Set-AzureRmDiskImageReference', 'Set-AzureRmDiskKeyEncryptionKey',
150+
'New-AzureRmDiskUpdateConfig',
151+
'Set-AzureRmDiskUpdateDiskEncryptionKey',
152+
'Set-AzureRmDiskUpdateImageReference',
153+
'Set-AzureRmDiskUpdateKeyEncryptionKey', 'New-AzureRmSnapshot',
154+
'Update-AzureRmSnapshot', 'Get-AzureRmSnapshot',
155+
'Remove-AzureRmSnapshot', 'Grant-AzureRmSnapshotAccess',
156+
'Revoke-AzureRmSnapshotAccess', 'New-AzureRmSnapshotConfig',
157+
'Set-AzureRmSnapshotDiskEncryptionKey',
158+
'Set-AzureRmSnapshotImageReference',
159+
'Set-AzureRmSnapshotKeyEncryptionKey',
160+
'New-AzureRmSnapshotUpdateConfig',
161+
'Set-AzureRmSnapshotUpdateDiskEncryptionKey',
162+
'Set-AzureRmSnapshotUpdateImageReference',
163+
'Set-AzureRmSnapshotUpdateKeyEncryptionKey', 'New-AzureRmImage',
164+
'Update-AzureRmImage', 'Get-AzureRmImage', 'Remove-AzureRmImage',
165+
'New-AzureRmImageConfig', 'Set-AzureRmImageOsDisk',
166+
'Add-AzureRmImageDataDisk', 'Remove-AzureRmImageDataDisk',
167+
'ConvertTo-AzureRmVMManagedDisk', 'Set-AzureRmVmssBootDiagnostic',
168+
'Get-AzureRmComputeResourceSku', 'Get-AzureRmVMRunCommandDocument',
169+
'Invoke-AzureRmVMRunCommand', 'Start-AzureRmVmssRollingOSUpgrade',
170+
'Stop-AzureRmVmssRollingUpgrade', 'Get-AzureRmVmssRollingUpgrade',
171+
'Set-AzureRmVmssRollingUpgradePolicy',
172+
'Set-AzureRmVmssDiskEncryptionExtension',
173+
'Disable-AzureRmVmssDiskEncryption',
174+
'Get-AzureRmVmssDiskEncryption', 'Get-AzureRmVmssVMDiskEncryption',
175+
'Export-AzureRmLogAnalyticRequestRateByInterval',
176+
'Export-AzureRmLogAnalyticThrottledRequests'
175177

176178
# Variables to export from this module
177179
# VariablesToExport = @()
178180

179181
# Aliases 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 aliases to export.
180-
AliasesToExport = ''
182+
AliasesToExport = 'Get-AzureRmVmssDiskEncryptionStatus',
183+
'Get-AzureRmVmssVMDiskEncryptionStatus'
181184

182185
# DSC resources to export from this module
183186
# DscResourcesToExport = @()

0 commit comments

Comments
 (0)