Skip to content

Commit d71e7aa

Browse files
cormacpaynecormacpayne
committed
Merge remote-tracking branch 'upstream/preview' into breaking-changes
# Conflicts: # tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
2 parents c5551b0 + dbedc33 commit d71e7aa

File tree

316 files changed

+8138
-112565
lines changed

Some content is hidden

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

316 files changed

+8138
-112565
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dotnet: 2.1.2
55
dist: trusty
66

77
env:
8-
- NAME="azure-powershell-core" CONFIG="Release"
8+
- NAME="azure-powershell-core" CONFIG="Debug"
99

1010
services:
1111
- docker
@@ -21,6 +21,7 @@ before_install:
2121

2222
script:
2323
- dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG
24+
- dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter="AcceptanceType=CheckIn" --configuration $CONFIG
2425

2526
after_success:
2627
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

‎Azure.PowerShell.Netcore.sln

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Compute.Netcore",
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Network.Netcore", "src\ResourceManager\Network\Commands.Network\Commands.Network.Netcore.csproj", "{40ACDC82-5A87-4D52-83B5-ED21274363A5}"
3333
EndProject
34-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4B187BE1-F8C4-4658-AD17-98AA087482AA}"
35-
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Profile.Test.Netcore", "src\ResourceManager\Profile\Commands.Profile.Test\Commands.Profile.Test.Netcore.csproj", "{87246108-B555-4F5F-B916-A9C6FABB1971}"
37-
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ResourceManager.ScenarioTests.Netcore", "src\ResourceManager\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ResourceManager.ScenarioTests.Netcore.csproj", "{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}"
39-
EndProject
4034
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Rbac.Netcore", "src\Common\Commands.Common.Graph.RBAC\Common.Rbac.Netcore.csproj", "{32BB23AC-A900-4EB8-ABBE-D8AABEB90E31}"
4135
EndProject
4236
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Authorization.Netcore", "src\Common\Commands.Common.Authorization\Common.Authorization.Netcore.csproj", "{826C77AA-C038-46F1-86AE-9A9F2E564D41}"
@@ -49,8 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Aks.Netcore", "src
4943
EndProject
5044
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Strategies.Netcore", "src\ResourceManager\Common\Commands.Common.Strategies\Common.Strategies.Netcore.csproj", "{77492655-0086-49E8-B941-7C3E9D5448E9}"
5145
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Tests", "src\Common\Commands.Common.Tests\Commands.Common.Tests.csproj", "{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}"
53-
EndProject
5446
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Compute.Netcore", "src\Common\Commands.Common.Compute\Commands.Common.Compute.Netcore.csproj", "{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}"
5547
EndProject
5648
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AnalysisServices.Netcore", "src\ResourceManager\AnalysisServices\Commands.AnalysisServices\Commands.AnalysisServices.Netcore.csproj", "{C348F9F1-3CF4-4B98-91C7-C13C0386DBC7}"
@@ -135,8 +127,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.LocationBasedServi
135127
EndProject
136128
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Partner.Netcore", "src\ResourceManager\ManagementPartner\Commands.Partner\Commands.Partner.Netcore.csproj", "{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}"
137129
EndProject
138-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AzureBackup.Netcore", "src\ResourceManager\AzureBackup\Commands.AzureBackup\Commands.AzureBackup.Netcore.csproj", "{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}"
139-
EndProject
140130
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ManagedServiceIdentity.Netcore", "src\ResourceManager\ManagedServiceIdentity\Commands.ManagedServiceIdentity\Commands.ManagedServiceIdentity.Netcore.csproj", "{E2BA3DC7-E3BA-4B04-8B4A-017DABED9486}"
141131
EndProject
142132
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlManagement.Netcore", "src\ResourceManager\Sql\LegacySdk\SqlManagement.Netcore.csproj", "{7228F936-ABF5-4A42-9012-37A6D76805DB}"
@@ -333,30 +323,6 @@ Global
333323
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Release|x64.Build.0 = Release|Any CPU
334324
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Release|x86.ActiveCfg = Release|Any CPU
335325
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Release|x86.Build.0 = Release|Any CPU
336-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
337-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|Any CPU.Build.0 = Debug|Any CPU
338-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|x64.ActiveCfg = Debug|Any CPU
339-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|x64.Build.0 = Debug|Any CPU
340-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|x86.ActiveCfg = Debug|Any CPU
341-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Debug|x86.Build.0 = Debug|Any CPU
342-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|Any CPU.ActiveCfg = Release|Any CPU
343-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|Any CPU.Build.0 = Release|Any CPU
344-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|x64.ActiveCfg = Release|Any CPU
345-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|x64.Build.0 = Release|Any CPU
346-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|x86.ActiveCfg = Release|Any CPU
347-
{87246108-B555-4F5F-B916-A9C6FABB1971}.Release|x86.Build.0 = Release|Any CPU
348-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
349-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
350-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|x64.ActiveCfg = Debug|Any CPU
351-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|x64.Build.0 = Debug|Any CPU
352-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|x86.ActiveCfg = Debug|Any CPU
353-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Debug|x86.Build.0 = Debug|Any CPU
354-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
355-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|Any CPU.Build.0 = Release|Any CPU
356-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|x64.ActiveCfg = Release|Any CPU
357-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|x64.Build.0 = Release|Any CPU
358-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|x86.ActiveCfg = Release|Any CPU
359-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96}.Release|x86.Build.0 = Release|Any CPU
360326
{32BB23AC-A900-4EB8-ABBE-D8AABEB90E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
361327
{32BB23AC-A900-4EB8-ABBE-D8AABEB90E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
362328
{32BB23AC-A900-4EB8-ABBE-D8AABEB90E31}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -429,18 +395,6 @@ Global
429395
{77492655-0086-49E8-B941-7C3E9D5448E9}.Release|x64.Build.0 = Release|Any CPU
430396
{77492655-0086-49E8-B941-7C3E9D5448E9}.Release|x86.ActiveCfg = Release|Any CPU
431397
{77492655-0086-49E8-B941-7C3E9D5448E9}.Release|x86.Build.0 = Release|Any CPU
432-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
433-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|Any CPU.Build.0 = Debug|Any CPU
434-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|x64.ActiveCfg = Debug|Any CPU
435-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|x64.Build.0 = Debug|Any CPU
436-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|x86.ActiveCfg = Debug|Any CPU
437-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Debug|x86.Build.0 = Debug|Any CPU
438-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|Any CPU.ActiveCfg = Release|Any CPU
439-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|Any CPU.Build.0 = Release|Any CPU
440-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x64.ActiveCfg = Release|Any CPU
441-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x64.Build.0 = Release|Any CPU
442-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x86.ActiveCfg = Release|Any CPU
443-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x86.Build.0 = Release|Any CPU
444398
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
445399
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
446400
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -945,18 +899,6 @@ Global
945899
{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}.Release|x64.Build.0 = Release|Any CPU
946900
{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}.Release|x86.ActiveCfg = Release|Any CPU
947901
{E3F57ED9-36AA-43AE-9E37-8CDEF1278FAE}.Release|x86.Build.0 = Release|Any CPU
948-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
949-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
950-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|x64.ActiveCfg = Debug|Any CPU
951-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|x64.Build.0 = Debug|Any CPU
952-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|x86.ActiveCfg = Debug|Any CPU
953-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Debug|x86.Build.0 = Debug|Any CPU
954-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
955-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|Any CPU.Build.0 = Release|Any CPU
956-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|x64.ActiveCfg = Release|Any CPU
957-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|x64.Build.0 = Release|Any CPU
958-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|x86.ActiveCfg = Release|Any CPU
959-
{032DAFFB-8F2B-4522-827D-B79E6F8E50C8}.Release|x86.Build.0 = Release|Any CPU
960902
{E2BA3DC7-E3BA-4B04-8B4A-017DABED9486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
961903
{E2BA3DC7-E3BA-4B04-8B4A-017DABED9486}.Debug|Any CPU.Build.0 = Debug|Any CPU
962904
{E2BA3DC7-E3BA-4B04-8B4A-017DABED9486}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1069,11 +1011,6 @@ Global
10691011
GlobalSection(SolutionProperties) = preSolution
10701012
HideSolutionNode = FALSE
10711013
EndGlobalSection
1072-
GlobalSection(NestedProjects) = preSolution
1073-
{87246108-B555-4F5F-B916-A9C6FABB1971} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
1074-
{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
1075-
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
1076-
EndGlobalSection
10771014
GlobalSection(ExtensibilityGlobals) = postSolution
10781015
SolutionGuid = {0A9808F3-5476-4731-BD44-617A8BA3DD65}
10791016
EndGlobalSection

‎AzurePowershell.Test.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<CommonTestDebug>.\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
88
<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
99
<RecoveryServicesBackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
10-
<SiteRecoveryTestDebug>.\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll</SiteRecoveryTestDebug>
1110
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
1211
<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
1312
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>

‎TestMappings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@
141141
],
142142
"src/ResourceManager/RecoveryServices/": [
143143
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
144-
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll",
145-
".\\src\\ResourceManager\\SiteRecovery\\Commands.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.SiteRecovery.Test.dll"
144+
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
146145
],
147146
"src/ResourceManager/RedisCache/": [
148147
".\\src\\ResourceManager\\RedisCache\\Commands.RedisCache.Test\\bin\\Debug\\Microsoft.Azure.Commands.RedisCache.Test.dll"
@@ -159,16 +158,12 @@
159158
"src/ResourceManager/Scheduler/": [
160159
".\\src\\ResourceManager\\Scheduler\\Commands.Scheduler.Test\\bin\\Debug\\Microsoft.Azure.Commands.Scheduler.Test.dll"
161160
],
162-
"src/ResourceManager/ServerManagement/": [],
163161
"src/ResourceManager/ServiceBus/": [
164162
".\\src\\ResourceManager\\ServiceBus\\Commands.ServiceBus.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceBus.Test.dll"
165163
],
166164
"src/ResourceManager/ServiceFabric/": [
167165
".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll"
168166
],
169-
"src/ResourceManager/SiteRecovery/": [
170-
".\\src\\ResourceManager\\SiteRecovery\\Commands.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.SiteRecovery.Test.dll"
171-
],
172167
"src/ResourceManager/Sql/": [
173168
".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll"
174169
],

‎documentation/azure-powershell-modules.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
6060
| Reservations | `AzureRM.Reservations` | [![Reservations](https://img.shields.io/powershellgallery/v/AzureRM.Reservations.svg?style=flat-square&label=AzureRM.Reservations)](https://www.powershellgallery.com/packages/AzureRM.Reservations/) |
6161
| Resources | `AzureRM.Resources` | [![Resources](https://img.shields.io/powershellgallery/v/AzureRM.Resources.svg?style=flat-square&label=AzureRM.Resources)](https://www.powershellgallery.com/packages/AzureRM.Resources/) |
6262
| Scheduler | `AzureRM.Scheduler` | [![Scheduler](https://img.shields.io/powershellgallery/v/AzureRM.Scheduler.svg?style=flat-square&label=AzureRM.Scheduler)](https://www.powershellgallery.com/packages/AzureRM.Scheduler/) |
63-
| Server Management | `AzureRM.ServerManagement` | [![Server Management](https://img.shields.io/powershellgallery/v/AzureRM.ServerManagement.svg?style=flat-square&label=AzureRM.ServerManagement)](https://www.powershellgallery.com/packages/AzureRM.ServerManagement/) |
6463
| Service Bus | `AzureRM.ServiceBus` | [![Service Bus](https://img.shields.io/powershellgallery/v/AzureRM.ServiceBus.svg?style=flat-square&label=AzureRM.ServiceBus)](https://www.powershellgallery.com/packages/AzureRM.ServiceBus/) |
6564
| Service Fabric | `AzureRM.ServiceFabric` | [![Service Fabric](https://img.shields.io/powershellgallery/v/AzureRM.ServiceFabric.svg?style=flat-square&label=AzureRM.ServiceFabric)](https://www.powershellgallery.com/packages/AzureRM.ServiceFabric/) |
66-
| Site Recovery | `AzureRM.SiteRecovery` | [![Site Recovery](https://img.shields.io/powershellgallery/v/AzureRM.SiteRecovery.svg?style=flat-square&label=AzureRM.SiteRecovery)](https://www.powershellgallery.com/packages/AzureRM.SiteRecovery/) |
6765
| Sql | `AzureRM.Sql` | [![Sql](https://img.shields.io/powershellgallery/v/AzureRM.Sql.svg?style=flat-square&label=AzureRM.Sql)](https://www.powershellgallery.com/packages/AzureRM.Sql/) |
6866
| Storage | `AzureRM.Storage` | [![Storage](https://img.shields.io/powershellgallery/v/AzureRM.Storage.svg?style=flat-square&label=AzureRM.Storage)](https://www.powershellgallery.com/packages/AzureRM.Storage/) |
6967
| Stream Analytics | `AzureRM.StreamAnalytics` | [![Stream Analytics](https://img.shields.io/powershellgallery/v/AzureRM.StreamAnalytics.svg?style=flat-square&label=AzureRM.StreamAnalytics)](https://www.powershellgallery.com/packages/AzureRM.StreamAnalytics/) |

0 commit comments

Comments
 (0)