Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sergey-shandar committed Dec 4, 2017
2 parents acf4373 + 9c9771b commit 5f34994
Show file tree
Hide file tree
Showing 351 changed files with 701,646 additions and 1,098,713 deletions.
6 changes: 0 additions & 6 deletions AzurePowershell.Test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
<LogicAppTestDebug>.\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll</LogicAppTestDebug>
<SchedulerTestDebug>.\src\ResourceManager\Scheduler\Commands.Scheduler.Test\bin\Debug\Microsoft.Azure.Commands.Scheduler.Test.dll</SchedulerTestDebug>
<RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
Expand Down Expand Up @@ -187,11 +186,6 @@
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestRemoteApp">
<Xunit.Runner.MSBuild.xunit Assemblies="$(RemoteAppTestDebug)" Html="$(TestOutputDirectory)\RemoteAppTestDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestWebsites">
<Xunit.Runner.MSBuild.xunit Assemblies="$(WebsitesTestDebug)" Html="$(TestOutputDirectory)\WebsitesTestDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
Expand Down
2 changes: 0 additions & 2 deletions TestMappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
".\\src\\ServiceManagement\\Services\\Commands.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Test.dll",
".\\src\\ServiceManagement\\StorSimple\\Commands.StorSimple.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll",
".\\src\\ServiceManagement\\RemoteApp\\Commands.RemoteApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.RemoteApp.Tests.dll",
".\\src\\ServiceManagement\\Common\\Commands.ScenarioTest\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ScenarioTest.dll",
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"
Expand All @@ -148,7 +147,6 @@
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
".\\src\\ServiceManagement\\Services\\Commands.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Test.dll",
".\\src\\ServiceManagement\\StorSimple\\Commands.StorSimple.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll",
".\\src\\ServiceManagement\\RemoteApp\\Commands.RemoteApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.RemoteApp.Tests.dll",
".\\src\\ServiceManagement\\Common\\Commands.ScenarioTest\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ScenarioTest.dll",
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"
Expand Down
130 changes: 0 additions & 130 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -2250,104 +2250,6 @@
</Component>
</Directory>
</Directory>
<Directory Id="dirDF012C486C7A9897E2E985413D188EFB" Name="RemoteApp">
<Component Id="cmp876FCC4B6F7590AC9D51ABDD32229647" Guid="*">
<File Id="fil3C4F434DCE5410C69A1E3487C1326C5A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Hyak.Common.dll" />
</Component>
<Component Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" Guid="*">
<File Id="filE981789E3D355209532B0CE4EA414B69" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.ApplicationInsights.dll" />
</Component>
<Component Id="cmpB5AB874BBCA86A4E931942DE2119DA42" Guid="*">
<File Id="filE0309CD356CC88BD1F7CAF71D29A857B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
</Component>
<Component Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" Guid="*">
<File Id="fil27EBA2AC9E474ACC5A87F07B809B6DA4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" Guid="*">
<File Id="fil83B7914462FDE1E5AF770AB859D8B842" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" Guid="*">
<File Id="fil519585B1FCAB1A8CC6D2358A8ABCAF64" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.KeyVault.Core.dll" />
</Component>
<Component Id="cmp20193DF5170BBA9B0BE967155AF5F05C" Guid="*">
<File Id="filC19FDC44F712388F8C9CE585B3823B3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.ResourceManager.dll" />
</Component>
<Component Id="cmpB67E98F8DD3717DE55704662D73EB3DC" Guid="*">
<File Id="fil6DAFF57FDE88ADA1BECDE46CCD1B61A1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Edm.dll" />
</Component>
<Component Id="cmp645D8B7138F96F1053AB259E37D61D3D" Guid="*">
<File Id="filEAD8D5453E4DF1A6D104EDD2BEEE997D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.OData.dll" />
</Component>
<Component Id="cmpF304B1EDB19805B49E0015BE90824B00" Guid="*">
<File Id="filB41F2071EEABDF866C99DD9978174991" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Services.Client.dll" />
</Component>
<Component Id="cmp77D952CC555ECC8D893704C409770064" Guid="*">
<File Id="fil740874B2C7BABACB68258773DEF81026" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" Guid="*">
<File Id="fil8A7F8D2E49DE26EB3A6A45D325845EC5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmp0A8941117B39B5A0CA1C90919DFF2E78" Guid="*">
<File Id="fil43906FEF64E41B4439BA5C117185D292" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmpA4A58C94EE47090F62EFE436AC816A2B" Guid="*">
<File Id="fil77FF118B750C7184FFAC6AB833CE185E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Rest.ClientRuntime.dll" />
</Component>
<Component Id="cmpF6A31E71E73261E256FB53289879CAC6" Guid="*">
<File Id="filB43C04EDB705D1968040C62BE7385426" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.dll" />
</Component>
<Component Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" Guid="*">
<File Id="filBD3B9725212B207BA71ACFEFCE499952" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
</Component>
<Component Id="cmpC6E9F874597250F8F9018EE96BD563C1" Guid="*">
<File Id="filD702F499B490185A0B37C88201372218" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.dll" />
</Component>
<Component Id="cmp834EB592C6925B045C8B0510B26AF6B9" Guid="*">
<File Id="filEE9E830711213A45933A4822FB584B57" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmp52FF148EB192D51478E0DB900FEBCD2E" Guid="*">
<File Id="fil40322DF202E11B811ABDFFBA56039391" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.RemoteApp.dll" />
</Component>
<Component Id="cmpC5E3FEA322C85A119AAD3B33E914D775" Guid="*">
<File Id="fil0CFDA9095E04103C55F1C87B6636D651" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.RemoteApp.dll-help.xml" />
</Component>
<Component Id="cmp46193232CDB894987D40E67AB294EF48" Guid="*">
<File Id="filC3CF163EA6EF6E8B0B19863EA0E71FC7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll" />
</Component>
<Component Id="cmpA85120F9A61D215485073CD1776A50EC" Guid="*">
<File Id="fil7361F1D3E3E7266D5E6F74C4AC8C68AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Compute.dll" />
</Component>
<Component Id="cmpB365045D7785EED68D215DE18F8B6827" Guid="*">
<File Id="fil0A337D8FFA8479187FFB2DB28F87C707" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.dll" />
</Component>
<Component Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" Guid="*">
<File Id="fil0D8F856AC786EC316BB1409033666BD6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Network.dll" />
</Component>
<Component Id="cmpDC3E69C7CE6C4812192FC8F40BDB76EF" Guid="*">
<File Id="fil7CE0C0C22EBCB84160ADBFB502CE1624" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.RemoteApp.dll" />
</Component>
<Component Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" Guid="*">
<File Id="filDDEDC4CFD49C82F88AF85EF9873BCD18" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Storage.dll" />
</Component>
<Component Id="cmp93364B74891D090E8B79AAD7B2D74521" Guid="*">
<File Id="fil43F3698E2CAA6C4A28A571893D7DD2CB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Storage.dll" />
</Component>
<Component Id="cmp0DDAC0F6E13422C982E3A7BE75016837" Guid="*">
<File Id="fil7BCDAAE0F3CA862FB78DC09EE3C10309" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmpC75F982B777810AB4731D6E62AE087ED" Guid="*">
<File Id="fil01509C768D43E7413DD076BD89C72939" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Extensions.dll" />
</Component>
<Component Id="cmp61404C8CABE874A3DCC4AAA743606C62" Guid="*">
<File Id="filA811F36C97683F1FA68FBB7AE6E908DD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Formatting.dll" />
</Component>
<Component Id="cmp0B4140C0041F650FB202F15FD4F86721" Guid="*">
<File Id="fil59BC8F7918C21B61C9217189CE3A3B27" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Primitives.dll" />
</Component>
<Component Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" Guid="*">
<File Id="filF416020F6AC78654E2B61B571FBE32B9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Spatial.dll" />
</Component>
</Directory>
<Directory Id="dir5A14F7172D6373ACE47493BAD054EEF3" Name="Services">
<Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
<File Id="filF7E717D6789D9D4D072D3BA81461FCB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.dll" />
Expand Down Expand Up @@ -3868,38 +3770,6 @@
<ComponentRef Id="cmp4ED39EDE761ED68263635882802FB1B5" />
<ComponentRef Id="cmp2A0B3E88742D800F88F70A714BAC94B5" />
<ComponentRef Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" />
<ComponentRef Id="cmp876FCC4B6F7590AC9D51ABDD32229647" />
<ComponentRef Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" />
<ComponentRef Id="cmpB5AB874BBCA86A4E931942DE2119DA42" />
<ComponentRef Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" />
<ComponentRef Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" />
<ComponentRef Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" />
<ComponentRef Id="cmp20193DF5170BBA9B0BE967155AF5F05C" />
<ComponentRef Id="cmpB67E98F8DD3717DE55704662D73EB3DC" />
<ComponentRef Id="cmp645D8B7138F96F1053AB259E37D61D3D" />
<ComponentRef Id="cmpF304B1EDB19805B49E0015BE90824B00" />
<ComponentRef Id="cmp77D952CC555ECC8D893704C409770064" />
<ComponentRef Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" />
<ComponentRef Id="cmp0A8941117B39B5A0CA1C90919DFF2E78" />
<ComponentRef Id="cmpA4A58C94EE47090F62EFE436AC816A2B" />
<ComponentRef Id="cmpF6A31E71E73261E256FB53289879CAC6" />
<ComponentRef Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" />
<ComponentRef Id="cmpC6E9F874597250F8F9018EE96BD563C1" />
<ComponentRef Id="cmp834EB592C6925B045C8B0510B26AF6B9" />
<ComponentRef Id="cmp52FF148EB192D51478E0DB900FEBCD2E" />
<ComponentRef Id="cmpC5E3FEA322C85A119AAD3B33E914D775" />
<ComponentRef Id="cmp46193232CDB894987D40E67AB294EF48" />
<ComponentRef Id="cmpA85120F9A61D215485073CD1776A50EC" />
<ComponentRef Id="cmpB365045D7785EED68D215DE18F8B6827" />
<ComponentRef Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" />
<ComponentRef Id="cmpDC3E69C7CE6C4812192FC8F40BDB76EF" />
<ComponentRef Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" />
<ComponentRef Id="cmp93364B74891D090E8B79AAD7B2D74521" />
<ComponentRef Id="cmp0DDAC0F6E13422C982E3A7BE75016837" />
<ComponentRef Id="cmpC75F982B777810AB4731D6E62AE087ED" />
<ComponentRef Id="cmp61404C8CABE874A3DCC4AAA743606C62" />
<ComponentRef Id="cmp0B4140C0041F650FB202F15FD4F86721" />
<ComponentRef Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" />
<ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
<ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />
<ComponentRef Id="cmp401224722DA5F5678A1230A4DEC4B453" />
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/Automation/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Current Release
* Update to Import-AzureRMAutomationRunbook
- Support is now being provided for Python2 runbooks

## Version 4.0.0
* Add support for online help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,20 @@ public override void ExecuteCmdlet()
{
var nodeName = System.IO.Path.GetFileNameWithoutExtension(Path);
var nodeConfigurationName = ConfigurationName + "." + nodeName;
NodeConfiguration nodeConfigurationModel = null;

// if node configuration already exists, ensureuser knows about it.
var nodeConfigurationModel = AutomationClient.GetNodeConfiguration(ResourceGroupName,
AutomationAccountName,
nodeConfigurationName,
null);
try
{
// if node configuration already exists, ensureuser knows about it.
nodeConfigurationModel = AutomationClient.GetNodeConfiguration(ResourceGroupName,
AutomationAccountName,
nodeConfigurationName,
null);
}
catch (ResourceNotFoundException)
{
nodeConfigurationModel = null;
}

if (nodeConfigurationModel != null && !IncrementNodeConfigurationBuild.IsPresent)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ----------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -66,6 +66,7 @@ public class ImportAzureAutomationRunbook : AzureAutomationBaseCmdlet
Constants.RunbookType.PowerShellWorkflow,
Constants.RunbookType.GraphicalPowerShellWorkflow,
Constants.RunbookType.Graph,
Constants.RunbookType.Python2,
IgnoreCase = true)]
[ValidateNotNullOrEmpty]
public string Type { get; set; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ----------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -489,6 +489,9 @@ public Runbook ImportRunbook(string resourceGroupName, string automationAccountN
StringComparison.OrdinalIgnoreCase) &&
0 !=
string.Compare(fileExtension, Constants.SupportedFileExtensions.Graph,
StringComparison.OrdinalIgnoreCase) &&
0 !=
string.Compare(fileExtension, Constants.SupportedFileExtensions.Python,
StringComparison.OrdinalIgnoreCase))
{
throw new ResourceCommonException(typeof(Runbook),
Expand Down
Loading

0 comments on commit 5f34994

Please sign in to comment.