Skip to content

Commit 6f13931

Browse files
azdevxpsazdevxps
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into startupscripts
2 parents 75ff63d + 339519b commit 6f13931

File tree

877 files changed

+806218
-1099391
lines changed

Some content is hidden

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

877 files changed

+806218
-1099391
lines changed

‎AzurePowershell.Test.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
2727
<LogicAppTestDebug>.\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll</LogicAppTestDebug>
2828
<SchedulerTestDebug>.\src\ResourceManager\Scheduler\Commands.Scheduler.Test\bin\Debug\Microsoft.Azure.Commands.Scheduler.Test.dll</SchedulerTestDebug>
29-
<RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
3029
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
3130
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
3231
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
@@ -187,11 +186,6 @@
187186
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
188187
</Target>
189188

190-
<Target Name="TestRemoteApp">
191-
<Xunit.Runner.MSBuild.xunit Assemblies="$(RemoteAppTestDebug)" Html="$(TestOutputDirectory)\RemoteAppTestDebug.xunit.dll.html" Verbose="false"
192-
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
193-
</Target>
194-
195189
<Target Name="TestWebsites">
196190
<Xunit.Runner.MSBuild.xunit Assemblies="$(WebsitesTestDebug)" Html="$(TestOutputDirectory)\WebsitesTestDebug.xunit.dll.html" Verbose="false"
197191
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />

‎TestMappings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
"src/ResourceManager/StreamAnalytics/": [
124124
".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
125125
],
126+
"src/ResourceManager/Subscription/": [
127+
".\\src\\ResourceManager\\Subscription\\Commands.Subscription.Test\\bin\\Debug\\Microsoft.Azure.Commands.Subscription.Test.dll"
128+
],
126129
"src/ResourceManager/Tags/": [],
127130
"src/ResourceManager/TrafficManager/": [
128131
".\\src\\ResourceManager\\TrafficManager\\Commands.TrafficManager2.Test\\bin\\Debug\\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"
@@ -137,7 +140,6 @@
137140
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
138141
".\\src\\ServiceManagement\\Services\\Commands.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Test.dll",
139142
".\\src\\ServiceManagement\\StorSimple\\Commands.StorSimple.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll",
140-
".\\src\\ServiceManagement\\RemoteApp\\Commands.RemoteApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.RemoteApp.Tests.dll",
141143
".\\src\\ServiceManagement\\Common\\Commands.ScenarioTest\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ScenarioTest.dll",
142144
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
143145
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"
@@ -148,7 +150,6 @@
148150
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
149151
".\\src\\ServiceManagement\\Services\\Commands.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Test.dll",
150152
".\\src\\ServiceManagement\\StorSimple\\Commands.StorSimple.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll",
151-
".\\src\\ServiceManagement\\RemoteApp\\Commands.RemoteApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.RemoteApp.Tests.dll",
152153
".\\src\\ServiceManagement\\Common\\Commands.ScenarioTest\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ScenarioTest.dll",
153154
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
154155
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,104 +2278,6 @@
22782278
</Component>
22792279
</Directory>
22802280
</Directory>
2281-
<Directory Id="dirDF012C486C7A9897E2E985413D188EFB" Name="RemoteApp">
2282-
<Component Id="cmp876FCC4B6F7590AC9D51ABDD32229647" Guid="*">
2283-
<File Id="fil3C4F434DCE5410C69A1E3487C1326C5A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Hyak.Common.dll" />
2284-
</Component>
2285-
<Component Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" Guid="*">
2286-
<File Id="filE981789E3D355209532B0CE4EA414B69" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.ApplicationInsights.dll" />
2287-
</Component>
2288-
<Component Id="cmpB5AB874BBCA86A4E931942DE2119DA42" Guid="*">
2289-
<File Id="filE0309CD356CC88BD1F7CAF71D29A857B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
2290-
</Component>
2291-
<Component Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" Guid="*">
2292-
<File Id="fil27EBA2AC9E474ACC5A87F07B809B6DA4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.dll" />
2293-
</Component>
2294-
<Component Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" Guid="*">
2295-
<File Id="fil83B7914462FDE1E5AF770AB859D8B842" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.NetFramework.dll" />
2296-
</Component>
2297-
<Component Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" Guid="*">
2298-
<File Id="fil519585B1FCAB1A8CC6D2358A8ABCAF64" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.KeyVault.Core.dll" />
2299-
</Component>
2300-
<Component Id="cmp20193DF5170BBA9B0BE967155AF5F05C" Guid="*">
2301-
<File Id="filC19FDC44F712388F8C9CE585B3823B3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.ResourceManager.dll" />
2302-
</Component>
2303-
<Component Id="cmpB67E98F8DD3717DE55704662D73EB3DC" Guid="*">
2304-
<File Id="fil6DAFF57FDE88ADA1BECDE46CCD1B61A1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Edm.dll" />
2305-
</Component>
2306-
<Component Id="cmp645D8B7138F96F1053AB259E37D61D3D" Guid="*">
2307-
<File Id="filEAD8D5453E4DF1A6D104EDD2BEEE997D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.OData.dll" />
2308-
</Component>
2309-
<Component Id="cmpF304B1EDB19805B49E0015BE90824B00" Guid="*">
2310-
<File Id="filB41F2071EEABDF866C99DD9978174991" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Services.Client.dll" />
2311-
</Component>
2312-
<Component Id="cmp77D952CC555ECC8D893704C409770064" Guid="*">
2313-
<File Id="fil740874B2C7BABACB68258773DEF81026" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2314-
</Component>
2315-
<Component Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" Guid="*">
2316-
<File Id="fil8A7F8D2E49DE26EB3A6A45D325845EC5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
2317-
</Component>
2318-
<Component Id="cmp0A8941117B39B5A0CA1C90919DFF2E78" Guid="*">
2319-
<File Id="fil43906FEF64E41B4439BA5C117185D292" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
2320-
</Component>
2321-
<Component Id="cmpA4A58C94EE47090F62EFE436AC816A2B" Guid="*">
2322-
<File Id="fil77FF118B750C7184FFAC6AB833CE185E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Rest.ClientRuntime.dll" />
2323-
</Component>
2324-
<Component Id="cmpF6A31E71E73261E256FB53289879CAC6" Guid="*">
2325-
<File Id="filB43C04EDB705D1968040C62BE7385426" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.dll" />
2326-
</Component>
2327-
<Component Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" Guid="*">
2328-
<File Id="filBD3B9725212B207BA71ACFEFCE499952" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
2329-
</Component>
2330-
<Component Id="cmpC6E9F874597250F8F9018EE96BD563C1" Guid="*">
2331-
<File Id="filD702F499B490185A0B37C88201372218" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.dll" />
2332-
</Component>
2333-
<Component Id="cmp834EB592C6925B045C8B0510B26AF6B9" Guid="*">
2334-
<File Id="filEE9E830711213A45933A4822FB584B57" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.Common.dll" />
2335-
</Component>
2336-
<Component Id="cmp52FF148EB192D51478E0DB900FEBCD2E" Guid="*">
2337-
<File Id="fil40322DF202E11B811ABDFFBA56039391" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.RemoteApp.dll" />
2338-
</Component>
2339-
<Component Id="cmpC5E3FEA322C85A119AAD3B33E914D775" Guid="*">
2340-
<File Id="fil0CFDA9095E04103C55F1C87B6636D651" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.RemoteApp.dll-help.xml" />
2341-
</Component>
2342-
<Component Id="cmp46193232CDB894987D40E67AB294EF48" Guid="*">
2343-
<File Id="filC3CF163EA6EF6E8B0B19863EA0E71FC7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll" />
2344-
</Component>
2345-
<Component Id="cmpA85120F9A61D215485073CD1776A50EC" Guid="*">
2346-
<File Id="fil7361F1D3E3E7266D5E6F74C4AC8C68AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Compute.dll" />
2347-
</Component>
2348-
<Component Id="cmpB365045D7785EED68D215DE18F8B6827" Guid="*">
2349-
<File Id="fil0A337D8FFA8479187FFB2DB28F87C707" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.dll" />
2350-
</Component>
2351-
<Component Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" Guid="*">
2352-
<File Id="fil0D8F856AC786EC316BB1409033666BD6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Network.dll" />
2353-
</Component>
2354-
<Component Id="cmpDC3E69C7CE6C4812192FC8F40BDB76EF" Guid="*">
2355-
<File Id="fil7CE0C0C22EBCB84160ADBFB502CE1624" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.RemoteApp.dll" />
2356-
</Component>
2357-
<Component Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" Guid="*">
2358-
<File Id="filDDEDC4CFD49C82F88AF85EF9873BCD18" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Storage.dll" />
2359-
</Component>
2360-
<Component Id="cmp93364B74891D090E8B79AAD7B2D74521" Guid="*">
2361-
<File Id="fil43F3698E2CAA6C4A28A571893D7DD2CB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Storage.dll" />
2362-
</Component>
2363-
<Component Id="cmp0DDAC0F6E13422C982E3A7BE75016837" Guid="*">
2364-
<File Id="fil7BCDAAE0F3CA862FB78DC09EE3C10309" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Newtonsoft.Json.dll" />
2365-
</Component>
2366-
<Component Id="cmpC75F982B777810AB4731D6E62AE087ED" Guid="*">
2367-
<File Id="fil01509C768D43E7413DD076BD89C72939" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Extensions.dll" />
2368-
</Component>
2369-
<Component Id="cmp61404C8CABE874A3DCC4AAA743606C62" Guid="*">
2370-
<File Id="filA811F36C97683F1FA68FBB7AE6E908DD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Formatting.dll" />
2371-
</Component>
2372-
<Component Id="cmp0B4140C0041F650FB202F15FD4F86721" Guid="*">
2373-
<File Id="fil59BC8F7918C21B61C9217189CE3A3B27" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Primitives.dll" />
2374-
</Component>
2375-
<Component Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" Guid="*">
2376-
<File Id="filF416020F6AC78654E2B61B571FBE32B9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Spatial.dll" />
2377-
</Component>
2378-
</Directory>
23792281
<Directory Id="dir5A14F7172D6373ACE47493BAD054EEF3" Name="Services">
23802282
<Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
23812283
<File Id="filF7E717D6789D9D4D072D3BA81461FCB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.dll" />
@@ -3896,38 +3798,6 @@
38963798
<ComponentRef Id="cmp4ED39EDE761ED68263635882802FB1B5" />
38973799
<ComponentRef Id="cmp2A0B3E88742D800F88F70A714BAC94B5" />
38983800
<ComponentRef Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" />
3899-
<ComponentRef Id="cmp876FCC4B6F7590AC9D51ABDD32229647" />
3900-
<ComponentRef Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" />
3901-
<ComponentRef Id="cmpB5AB874BBCA86A4E931942DE2119DA42" />
3902-
<ComponentRef Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" />
3903-
<ComponentRef Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" />
3904-
<ComponentRef Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" />
3905-
<ComponentRef Id="cmp20193DF5170BBA9B0BE967155AF5F05C" />
3906-
<ComponentRef Id="cmpB67E98F8DD3717DE55704662D73EB3DC" />
3907-
<ComponentRef Id="cmp645D8B7138F96F1053AB259E37D61D3D" />
3908-
<ComponentRef Id="cmpF304B1EDB19805B49E0015BE90824B00" />
3909-
<ComponentRef Id="cmp77D952CC555ECC8D893704C409770064" />
3910-
<ComponentRef Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" />
3911-
<ComponentRef Id="cmp0A8941117B39B5A0CA1C90919DFF2E78" />
3912-
<ComponentRef Id="cmpA4A58C94EE47090F62EFE436AC816A2B" />
3913-
<ComponentRef Id="cmpF6A31E71E73261E256FB53289879CAC6" />
3914-
<ComponentRef Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" />
3915-
<ComponentRef Id="cmpC6E9F874597250F8F9018EE96BD563C1" />
3916-
<ComponentRef Id="cmp834EB592C6925B045C8B0510B26AF6B9" />
3917-
<ComponentRef Id="cmp52FF148EB192D51478E0DB900FEBCD2E" />
3918-
<ComponentRef Id="cmpC5E3FEA322C85A119AAD3B33E914D775" />
3919-
<ComponentRef Id="cmp46193232CDB894987D40E67AB294EF48" />
3920-
<ComponentRef Id="cmpA85120F9A61D215485073CD1776A50EC" />
3921-
<ComponentRef Id="cmpB365045D7785EED68D215DE18F8B6827" />
3922-
<ComponentRef Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" />
3923-
<ComponentRef Id="cmpDC3E69C7CE6C4812192FC8F40BDB76EF" />
3924-
<ComponentRef Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" />
3925-
<ComponentRef Id="cmp93364B74891D090E8B79AAD7B2D74521" />
3926-
<ComponentRef Id="cmp0DDAC0F6E13422C982E3A7BE75016837" />
3927-
<ComponentRef Id="cmpC75F982B777810AB4731D6E62AE087ED" />
3928-
<ComponentRef Id="cmp61404C8CABE874A3DCC4AAA743606C62" />
3929-
<ComponentRef Id="cmp0B4140C0041F650FB202F15FD4F86721" />
3930-
<ComponentRef Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" />
39313801
<ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
39323802
<ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />
39333803
<ComponentRef Id="cmp401224722DA5F5678A1230A4DEC4B453" />

0 commit comments

Comments
 (0)