Skip to content

Commit 2acca63

Browse files
committed
Merge branch 'preview' into wilcob/createSubscription
2 parents a69fda6 + 33bfec8 commit 2acca63

File tree

69 files changed

+1472
-9318
lines changed

Some content is hidden

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

69 files changed

+1472
-9318
lines changed

Azure.PowerShell.Netcore.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Reservations.Netco
111111
EndProject
112112
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Scheduler.Netcore", "src\ResourceManager\Scheduler\Commands.Scheduler\Commands.Scheduler.Netcore.csproj", "{A65322AC-2B28-482C-84A5-59D8BAF2F46D}"
113113
EndProject
114-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ServerManagement.Netcore", "src\ResourceManager\ServerManagement\Commands.ServerManagement\Commands.ServerManagement.Netcore.csproj", "{A6D19586-2219-440C-A7C9-EA729DB76294}"
115-
EndProject
116114
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ServiceBus.Netcore", "src\ResourceManager\ServiceBus\Commands.ServiceBus\Commands.ServiceBus.Netcore.csproj", "{3BA76D29-C71E-42FC-B6E8-C9D06668D07C}"
117115
EndProject
118116
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ServiceFabric.Netcore", "src\ResourceManager\ServiceFabric\Commands.ServiceFabric\Commands.ServiceFabric.Netcore.csproj", "{6F245A28-8648-4A71-9DBA-ABC381CA9B7D}"
@@ -823,18 +821,6 @@ Global
823821
{A65322AC-2B28-482C-84A5-59D8BAF2F46D}.Release|x64.Build.0 = Release|Any CPU
824822
{A65322AC-2B28-482C-84A5-59D8BAF2F46D}.Release|x86.ActiveCfg = Release|Any CPU
825823
{A65322AC-2B28-482C-84A5-59D8BAF2F46D}.Release|x86.Build.0 = Release|Any CPU
826-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
827-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|Any CPU.Build.0 = Debug|Any CPU
828-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|x64.ActiveCfg = Debug|Any CPU
829-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|x64.Build.0 = Debug|Any CPU
830-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|x86.ActiveCfg = Debug|Any CPU
831-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Debug|x86.Build.0 = Debug|Any CPU
832-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|Any CPU.ActiveCfg = Release|Any CPU
833-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|Any CPU.Build.0 = Release|Any CPU
834-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|x64.ActiveCfg = Release|Any CPU
835-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|x64.Build.0 = Release|Any CPU
836-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|x86.ActiveCfg = Release|Any CPU
837-
{A6D19586-2219-440C-A7C9-EA729DB76294}.Release|x86.Build.0 = Release|Any CPU
838824
{3BA76D29-C71E-42FC-B6E8-C9D06668D07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
839825
{3BA76D29-C71E-42FC-B6E8-C9D06668D07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
840826
{3BA76D29-C71E-42FC-B6E8-C9D06668D07C}.Debug|x64.ActiveCfg = Debug|Any CPU

src/ResourceManager.ForRefactoringOnly.sln

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.B
179179
EndProject
180180
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Scheduler", "ResourceManager\Scheduler\Commands.Scheduler\Commands.Scheduler.csproj", "{84FABEE4-86CD-43B5-A131-9FDAE3A58F0B}"
181181
EndProject
182-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServerManagement", "ResourceManager\ServerManagement\Commands.ServerManagement\Commands.ServerManagement.csproj", "{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}"
183-
EndProject
184182
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceBus", "ResourceManager\ServiceBus\Commands.ServiceBus\Commands.ServiceBus.csproj", "{C26229EF-8700-4A4B-99DD-DCA77E0B96DC}"
185183
EndProject
186184
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Billing.Test", "ResourceManager\Billing\Commands.Billing.Test\Commands.Billing.Test.csproj", "{9A685061-0EF3-4963-AC60-88610F6D309E}"
@@ -201,8 +199,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.B
201199
EndProject
202200
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Scheduler.Test", "ResourceManager\Scheduler\Commands.Scheduler.Test\Commands.Scheduler.Test.csproj", "{7181C815-A8C5-4BEC-988F-BD1F64D0BDC9}"
203201
EndProject
204-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServerManagement.Test", "ResourceManager\ServerManagement\Commands.ServerManagement.Test\Commands.ServerManagement.Test.csproj", "{133561EC-8192-4ADC-AF41-39C4D3AD323B}"
205-
EndProject
206202
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceBus.Test", "ResourceManager\ServiceBus\Commands.ServiceBus.Test\Commands.ServiceBus.Test.csproj", "{B36F96EC-A9C1-4C86-B406-472FF4458C9E}"
207203
EndProject
208204
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.Dataplane", "ResourceManager\AnalysisServices\Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.csproj", "{4944B213-4F12-4815-B416-3FF1853ADCC1}"
@@ -1267,18 +1263,6 @@ Global
12671263
{84FABEE4-86CD-43B5-A131-9FDAE3A58F0B}.Release|x64.Build.0 = Release|Any CPU
12681264
{84FABEE4-86CD-43B5-A131-9FDAE3A58F0B}.Release|x86.ActiveCfg = Release|Any CPU
12691265
{84FABEE4-86CD-43B5-A131-9FDAE3A58F0B}.Release|x86.Build.0 = Release|Any CPU
1270-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1271-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
1272-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|x64.ActiveCfg = Debug|Any CPU
1273-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|x64.Build.0 = Debug|Any CPU
1274-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|x86.ActiveCfg = Debug|Any CPU
1275-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Debug|x86.Build.0 = Debug|Any CPU
1276-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
1277-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.Build.0 = Release|Any CPU
1278-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|x64.ActiveCfg = Release|Any CPU
1279-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|x64.Build.0 = Release|Any CPU
1280-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|x86.ActiveCfg = Release|Any CPU
1281-
{3CAE1B57-8192-4945-A6C5-6E5E8DEA4BA9}.Release|x86.Build.0 = Release|Any CPU
12821266
{C26229EF-8700-4A4B-99DD-DCA77E0B96DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12831267
{C26229EF-8700-4A4B-99DD-DCA77E0B96DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
12841268
{C26229EF-8700-4A4B-99DD-DCA77E0B96DC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1399,18 +1383,6 @@ Global
13991383
{7181C815-A8C5-4BEC-988F-BD1F64D0BDC9}.Release|x64.Build.0 = Release|Any CPU
14001384
{7181C815-A8C5-4BEC-988F-BD1F64D0BDC9}.Release|x86.ActiveCfg = Release|Any CPU
14011385
{7181C815-A8C5-4BEC-988F-BD1F64D0BDC9}.Release|x86.Build.0 = Release|Any CPU
1402-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1403-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
1404-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|x64.ActiveCfg = Debug|Any CPU
1405-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|x64.Build.0 = Debug|Any CPU
1406-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|x86.ActiveCfg = Debug|Any CPU
1407-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Debug|x86.Build.0 = Debug|Any CPU
1408-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
1409-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
1410-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|x64.ActiveCfg = Release|Any CPU
1411-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|x64.Build.0 = Release|Any CPU
1412-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|x86.ActiveCfg = Release|Any CPU
1413-
{133561EC-8192-4ADC-AF41-39C4D3AD323B}.Release|x86.Build.0 = Release|Any CPU
14141386
{B36F96EC-A9C1-4C86-B406-472FF4458C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14151387
{B36F96EC-A9C1-4C86-B406-472FF4458C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
14161388
{B36F96EC-A9C1-4C86-B406-472FF4458C9E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1753,7 +1725,6 @@ Global
17531725
{3EA1FA5A-32EE-4D5A-AB2C-8AD523078A56} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
17541726
{65E15D74-1E24-4600-8671-D0B420524B17} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
17551727
{7181C815-A8C5-4BEC-988F-BD1F64D0BDC9} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
1756-
{133561EC-8192-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
17571728
{B36F96EC-A9C1-4C86-B406-472FF4458C9E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
17581729
{C1BDA476-A5CC-4394-914D-48B0EC31A710} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
17591730
{03632E67-424C-4EE5-969A-CF9E4E3DE423} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}

src/ResourceManager/ServerManagement/AzureRM.ServerManagement.Netcore.psd1

Lines changed: 0 additions & 143 deletions
This file was deleted.

src/ResourceManager/ServerManagement/AzureRM.ServerManagement.psd1

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)