Skip to content

Commit 363ad97

Browse files
cormacpaynecormacpayne
authored
Merge branch 'preview' into vmssvm
2 parents 7f3902d + de13e78 commit 363ad97

File tree

838 files changed

+421390
-599062
lines changed

Some content is hidden

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

838 files changed

+421390
-599062
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Resources.Netcore"
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Netcore", "src\Common\Commands.Common.Storage\Common.Storage.Netcore.csproj", "{6B91BCDC-5031-4A7A-A566-83308FF997C6}"
2121
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Management.Netcore", "src\Common\Commands.Common.Storage.Management\Common.Storage.Management.Netcore.csproj", "{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}"
23+
EndProject
2224
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Management.Storage.Netcore", "src\ResourceManager\Storage\Commands.Management.Storage\Commands.Management.Storage.Netcore.csproj", "{6878D60B-AD5B-4D37-8B84-5D529090FBAC}"
2325
EndProject
2426
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Websites.Netcore", "src\ResourceManager\Websites\Commands.Websites\Commands.Websites.Netcore.csproj", "{59581DCA-1726-4EE2-A665-0112E681C35C}"
@@ -123,7 +125,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DataLakeStore.Netc
123125
EndProject
124126
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Insights.Netcore", "src\ResourceManager\Insights\Commands.Insights\Commands.Insights.Netcore.csproj", "{F900B1AF-C576-4A6D-A38E-722B73C79A25}"
125127
EndProject
126-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.LocationBasedServices.Netcore", "src\ResourceManager\LocationBasedServices\Commands.LocationBasedServices\Commands.LocationBasedServices.Netcore.csproj", "{025A3BBD-DB27-4F92-9E3D-3F5FB4D8D443}"
128+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Maps.Netcore", "src\ResourceManager\Maps\Commands.Maps\Commands.Maps.Netcore.csproj", "{025A3BBD-DB27-4F92-9E3D-3F5FB4D8D443}"
127129
EndProject
128130
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Partner.Netcore", "src\ResourceManager\ManagementPartner\Commands.Partner\Commands.Partner.Netcore.csproj", "{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}"
129131
EndProject
@@ -145,6 +147,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AnalysisServices.D
145147
EndProject
146148
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore", "src\Storage\Commands.Storage\Commands.Storage.Netcore.csproj", "{4F18000A-0329-4450-ADC8-8AA1C04A4666}"
147149
EndProject
150+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.KeyVault.Netcore", "src\Common\Commands.Common.KeyVault\Common.KeyVault.Netcore.csproj", "{836965C0-B198-4D01-B3D7-757DB62B49A0}"
151+
EndProject
148152
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Websites.Netcore", "src\Common\Commands.Common.Websites\Common.Websites.Netcore.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
149153
EndProject
150154
Global
@@ -253,6 +257,18 @@ Global
253257
{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x64.Build.0 = Release|Any CPU
254258
{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x86.ActiveCfg = Release|Any CPU
255259
{6B91BCDC-5031-4A7A-A566-83308FF997C6}.Release|x86.Build.0 = Release|Any CPU
260+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
261+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
262+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x64.ActiveCfg = Debug|Any CPU
263+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x64.Build.0 = Debug|Any CPU
264+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x86.ActiveCfg = Debug|Any CPU
265+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|x86.Build.0 = Debug|Any CPU
266+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
267+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.Build.0 = Release|Any CPU
268+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x64.ActiveCfg = Release|Any CPU
269+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x64.Build.0 = Release|Any CPU
270+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x86.ActiveCfg = Release|Any CPU
271+
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|x86.Build.0 = Release|Any CPU
256272
{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
257273
{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
258274
{6878D60B-AD5B-4D37-8B84-5D529090FBAC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1009,6 +1025,18 @@ Global
10091025
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x64.Build.0 = Release|Any CPU
10101026
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.ActiveCfg = Release|Any CPU
10111027
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.Build.0 = Release|Any CPU
1028+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1029+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
1030+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x64.ActiveCfg = Debug|Any CPU
1031+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x64.Build.0 = Debug|Any CPU
1032+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x86.ActiveCfg = Debug|Any CPU
1033+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|x86.Build.0 = Debug|Any CPU
1034+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
1035+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.Build.0 = Release|Any CPU
1036+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x64.ActiveCfg = Release|Any CPU
1037+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x64.Build.0 = Release|Any CPU
1038+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x86.ActiveCfg = Release|Any CPU
1039+
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|x86.Build.0 = Release|Any CPU
10121040
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10131041
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
10141042
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x64.ActiveCfg = Debug|Any CPU

‎documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ To import modules automatically when debug has started, follow the below steps:
246246
- In the **Debug** tab mentioned previously, go to **Start Options**
247247
- Import the Profile module, along with the module you are testing, by pasting the following in the **Command line arguments** box (_note_: you have to update the <PATH_TO_REPO> and <SERVICE> values provided below):
248248
- `-NoExit -Command "Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.Profile/AzureRM.Profile.psd1;Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.<SERVICE>/AzureRM.<SERVICE>.psd1;$VerbosePreference='Continue'"`
249+
250+
- **Note**: if you do not see all of the changes you made to the cmdlets when importing your module in a PowerShell session (_e.g.,_ a cmdlet you added is not recognized as a cmdlet), you may need to delete any existing Azure PowerShell modules that you have on your machine (installed either through the PowerShell Gallery or by Web Platform Installer) before you import your module.
249251

250252
## Adding Help Content
251253

0 commit comments

Comments
 (0)