Skip to content

Commit cd229c3

Browse files
dolauliazurepowershell
dolauli
and
azurepowershell
authored
[Blockchain] Merge blockchain to release-2021-08-03 branch (#15560)
* Move Blockchain to main * Update ChangeLog.md * Update Az.Blockchain.psd1 (#15558) Co-authored-by: azurepowershell <[email protected]>
1 parent 058a3c6 commit cd229c3

File tree

111 files changed

+9459
-2772
lines changed

Some content is hidden

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

111 files changed

+9459
-2772
lines changed

‎src/Blockchain/Az.Blockchain.format.ps1xml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@
172172
<TableColumnHeader>
173173
<Label>ConsortiumManagementAccountAddress</Label>
174174
</TableColumnHeader>
175-
<TableColumnHeader>
176-
<Label>ConsortiumManagementAccountPassword</Label>
177-
</TableColumnHeader>
178175
<TableColumnHeader>
179176
<Label>ConsortiumMemberDisplayName</Label>
180177
</TableColumnHeader>
@@ -184,9 +181,6 @@
184181
<TableColumnHeader>
185182
<Label>Dns</Label>
186183
</TableColumnHeader>
187-
<TableColumnHeader>
188-
<Label>Password</Label>
189-
</TableColumnHeader>
190184
<TableColumnHeader>
191185
<Label>Protocol</Label>
192186
</TableColumnHeader>
@@ -212,9 +206,6 @@
212206
<TableColumnItem>
213207
<PropertyName>ConsortiumManagementAccountAddress</PropertyName>
214208
</TableColumnItem>
215-
<TableColumnItem>
216-
<PropertyName>ConsortiumManagementAccountPassword</PropertyName>
217-
</TableColumnItem>
218209
<TableColumnItem>
219210
<PropertyName>ConsortiumMemberDisplayName</PropertyName>
220211
</TableColumnItem>
@@ -224,9 +215,6 @@
224215
<TableColumnItem>
225216
<PropertyName>Dns</PropertyName>
226217
</TableColumnItem>
227-
<TableColumnItem>
228-
<PropertyName>Password</PropertyName>
229-
</TableColumnItem>
230218
<TableColumnItem>
231219
<PropertyName>Protocol</PropertyName>
232220
</TableColumnItem>
@@ -247,34 +235,6 @@
247235
</TableRowEntries>
248236
</TableControl>
249237
</View>
250-
<View>
251-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Blockchain.Models.Api20180601Preview.BlockchainMemberPropertiesUpdate</Name>
252-
<ViewSelectedBy>
253-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Blockchain.Models.Api20180601Preview.BlockchainMemberPropertiesUpdate</TypeName>
254-
</ViewSelectedBy>
255-
<TableControl>
256-
<TableHeaders>
257-
<TableColumnHeader>
258-
<Label>Password</Label>
259-
</TableColumnHeader>
260-
<TableColumnHeader>
261-
<Label>ConsortiumManagementAccountPassword</Label>
262-
</TableColumnHeader>
263-
</TableHeaders>
264-
<TableRowEntries>
265-
<TableRowEntry>
266-
<TableColumnItems>
267-
<TableColumnItem>
268-
<PropertyName>Password</PropertyName>
269-
</TableColumnItem>
270-
<TableColumnItem>
271-
<PropertyName>ConsortiumManagementAccountPassword</PropertyName>
272-
</TableColumnItem>
273-
</TableColumnItems>
274-
</TableRowEntry>
275-
</TableRowEntries>
276-
</TableControl>
277-
</View>
278238
<View>
279239
<Name>Microsoft.Azure.PowerShell.Cmdlets.Blockchain.Models.Api20180601Preview.BlockchainMemberUpdateTags</Name>
280240
<ViewSelectedBy>
@@ -871,9 +831,6 @@
871831
<TableColumnHeader>
872832
<Label>Dns</Label>
873833
</TableColumnHeader>
874-
<TableColumnHeader>
875-
<Label>Password</Label>
876-
</TableColumnHeader>
877834
<TableColumnHeader>
878835
<Label>ProvisioningState</Label>
879836
</TableColumnHeader>
@@ -890,9 +847,6 @@
890847
<TableColumnItem>
891848
<PropertyName>Dns</PropertyName>
892849
</TableColumnItem>
893-
<TableColumnItem>
894-
<PropertyName>Password</PropertyName>
895-
</TableColumnItem>
896850
<TableColumnItem>
897851
<PropertyName>ProvisioningState</PropertyName>
898852
</TableColumnItem>
@@ -907,27 +861,5 @@
907861
</TableRowEntries>
908862
</TableControl>
909863
</View>
910-
<View>
911-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Blockchain.Models.Api20180601Preview.TransactionNodePropertiesUpdate</Name>
912-
<ViewSelectedBy>
913-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Blockchain.Models.Api20180601Preview.TransactionNodePropertiesUpdate</TypeName>
914-
</ViewSelectedBy>
915-
<TableControl>
916-
<TableHeaders>
917-
<TableColumnHeader>
918-
<Label>Password</Label>
919-
</TableColumnHeader>
920-
</TableHeaders>
921-
<TableRowEntries>
922-
<TableRowEntry>
923-
<TableColumnItems>
924-
<TableColumnItem>
925-
<PropertyName>Password</PropertyName>
926-
</TableColumnItem>
927-
</TableColumnItems>
928-
</TableRowEntry>
929-
</TableRowEntries>
930-
</TableControl>
931-
</View>
932864
</ViewDefinitions>
933865
</Configuration>

‎src/Blockchain/Az.Blockchain.psd1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,3 @@ PrivateData = @{
145145
# DefaultCommandPrefix = ''
146146

147147
}
148-

‎src/Blockchain/Az.Blockchain.psm1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
}
2525
}
2626
if(-not $accountsModule) {
27-
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
27+
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'2.2.3' } | Measure-Object).Count -gt 0
2828
if($hasAdequateVersion) {
29-
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
29+
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 2.2.3 -Scope Global -PassThru
3030
}
3131
}
3232
}
3333

3434
if(-not $accountsModule) {
35-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36-
} elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
37-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
35+
Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. For installation instructions, please see: https://docs.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
36+
} elseif (($accountsModule.Version -lt [System.Version]'2.2.3') -and (-not $localAccounts)) {
37+
Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to add the switch '-RegenerateSupportModule' when executing 'test-module.ps1'. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
3838
}
3939
Write-Information "Loaded Module '$($accountsModule.Name)'"
4040

‎src/Blockchain/Blockchain.sln

Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,90 @@
1+
12
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.29709.97
4+
VisualStudioVersion = 16.6.30114.105
45
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}"
67
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{62843FE6-7575-4D88-B989-7DF7EEC0BC01}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{1D265E56-0994-43D1-B3B4-1BEF5124282A}"
89
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{442C609B-A431-4A71-B289-08F0B63C83E5}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{04C0327C-F38E-4E00-B9A6-6EC14201C50A}"
1011
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}"
1213
EndProject
13-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Az.Blockchain", "Az.Blockchain.csproj", "{F3C879B0-DB94-4556-AB61-B4F727FF945E}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Blockchain", "Az.Blockchain.csproj", "{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}"
1415
EndProject
1516
Global
1617
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1718
Debug|Any CPU = Debug|Any CPU
19+
Debug|x64 = Debug|x64
20+
Debug|x86 = Debug|x86
1821
Release|Any CPU = Release|Any CPU
19-
EndGlobalSection
20-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22-
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
24-
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{F3C879B0-DB94-4556-AB61-B4F727FF945E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{F3C879B0-DB94-4556-AB61-B4F727FF945E}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{F3C879B0-DB94-4556-AB61-B4F727FF945E}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{F3C879B0-DB94-4556-AB61-B4F727FF945E}.Release|Any CPU.Build.0 = Release|Any CPU
22+
Release|x64 = Release|x64
23+
Release|x86 = Release|x86
4124
EndGlobalSection
4225
GlobalSection(SolutionProperties) = preSolution
4326
HideSolutionNode = FALSE
4427
EndGlobalSection
45-
GlobalSection(ExtensibilityGlobals) = postSolution
46-
SolutionGuid = {F9B3D96E-9680-40BE-A917-02EE655D6030}
28+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|x64.ActiveCfg = Debug|Any CPU
32+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|x64.Build.0 = Debug|Any CPU
33+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|x86.ActiveCfg = Debug|Any CPU
34+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Debug|x86.Build.0 = Debug|Any CPU
35+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|x64.ActiveCfg = Release|Any CPU
38+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|x64.Build.0 = Release|Any CPU
39+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|x86.ActiveCfg = Release|Any CPU
40+
{94AE5B0F-48E1-4688-BD2B-1F979AE337A8}.Release|x86.Build.0 = Release|Any CPU
41+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|x64.ActiveCfg = Debug|Any CPU
44+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|x64.Build.0 = Debug|Any CPU
45+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|x86.ActiveCfg = Debug|Any CPU
46+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Debug|x86.Build.0 = Debug|Any CPU
47+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|x64.ActiveCfg = Release|Any CPU
50+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|x64.Build.0 = Release|Any CPU
51+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|x86.ActiveCfg = Release|Any CPU
52+
{1D265E56-0994-43D1-B3B4-1BEF5124282A}.Release|x86.Build.0 = Release|Any CPU
53+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|x64.ActiveCfg = Debug|Any CPU
56+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|x64.Build.0 = Debug|Any CPU
57+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|x86.ActiveCfg = Debug|Any CPU
58+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Debug|x86.Build.0 = Debug|Any CPU
59+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|x64.ActiveCfg = Release|Any CPU
62+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|x64.Build.0 = Release|Any CPU
63+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|x86.ActiveCfg = Release|Any CPU
64+
{04C0327C-F38E-4E00-B9A6-6EC14201C50A}.Release|x86.Build.0 = Release|Any CPU
65+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|x64.ActiveCfg = Debug|Any CPU
68+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|x64.Build.0 = Debug|Any CPU
69+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|x86.ActiveCfg = Debug|Any CPU
70+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Debug|x86.Build.0 = Debug|Any CPU
71+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|Any CPU.Build.0 = Release|Any CPU
73+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|x64.ActiveCfg = Release|Any CPU
74+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|x64.Build.0 = Release|Any CPU
75+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|x86.ActiveCfg = Release|Any CPU
76+
{5E9EA91C-05A6-4853-B749-4F061CEAE3C4}.Release|x86.Build.0 = Release|Any CPU
77+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|x64.ActiveCfg = Debug|Any CPU
80+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|x64.Build.0 = Debug|Any CPU
81+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Debug|x86.Build.0 = Debug|Any CPU
83+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|x64.ActiveCfg = Release|Any CPU
86+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|x64.Build.0 = Release|Any CPU
87+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|x86.ActiveCfg = Release|Any CPU
88+
{AF024A4A-3C46-48B6-AC5D-B46AA2A17966}.Release|x86.Build.0 = Release|Any CPU
4789
EndGlobalSection
4890
EndGlobal

‎src/Blockchain/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
## Upcoming Release
21+
* Added breaking changes for all cmdlets since Blockchain will be retired.
2122

2223
## Version 0.3.0
2324
* On September 10, 2021, Azure Blockchain will be retired

‎src/Blockchain/build-module.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,16 @@ $moduleName = 'Az.Blockchain'
120120
$examplesFolder = Join-Path $PSScriptRoot 'examples'
121121
$null = New-Item -ItemType Directory -Force -Path $examplesFolder
122122

123+
Write-Host -ForegroundColor Green 'Creating cmdlets for specified models...'
124+
$modelCmdlets = @()
125+
if ($modelCmdlets.Count -gt 0) {
126+
. (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1')
127+
CreateModelCmdlet($modelCmdlets)
128+
}
129+
123130
if($NoDocs) {
124131
Write-Host -ForegroundColor Green 'Creating exports...'
125-
Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ExcludeDocs
132+
Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ExcludeDocs -ExamplesFolder $examplesFolder
126133
} else {
127134
Write-Host -ForegroundColor Green 'Creating exports and docs...'
128135
$moduleDescription = 'Microsoft Azure PowerShell: Blockchain cmdlets'

‎src/Blockchain/check-dependencies.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ if(Test-Path -Path $localModulesPath) {
4646
$env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
4747
}
4848

49-
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.7.4'
49+
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '2.2.3'
5050
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
5151

5252
$tools = Join-Path $PSScriptRoot 'tools'
5353
$resourceDir = Join-Path $tools 'Resources'
5454
$resourceModule = Join-Path $HOME '.PSSharedModules\Resources\Az.Resources.TestSupport.psm1'
5555

56-
if ($Resources.IsPresent -and (-not (Test-Path -Path $resourceModule))) {
56+
if ($Resources.IsPresent -and ((-not (Test-Path -Path $resourceModule)) -or $RegenerateSupportModule.IsPresent)) {
5757
Write-Host -ForegroundColor Green "Building local Resource module used for test..."
5858
Set-Location $resourceDir
59-
$null = autorest-beta .\readme.md --output-folder=$HOME/.PSSharedModules/Resources
59+
$null = autorest .\readme.md --use:@autorest/powershell@3.0.414 --output-folder=$HOME/.PSSharedModules/Resources
6060
$null = Copy-Item custom/* $HOME/.PSSharedModules/Resources/custom/
6161
Set-Location $HOME/.PSSharedModules/Resources
6262
$null = .\build-module.ps1

0 commit comments

Comments
 (0)