Skip to content

Dev #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Feb 9, 2016
Merged

Dev #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ba36f84
New-AzureLogicApp PowerShell command with unittest and scenario test …
pankajsn Dec 22, 2015
ca4be2f
Set, Get, Remove PowerShell commands added.
pankajsn Dec 28, 2015
4d88a9c
Azure Logic App PS cmdlets
pankajsn Jan 29, 2016
1dbf111
Merge remote-tracking branch 'refs/remotes/origin/dev' into Azure/dev
pankajsn Jan 29, 2016
98080ab
Merged with the latest code from GIT Repo
pankajsn Jan 29, 2016
7bd0b59
Merge remote-tracking branch 'refs/remotes/origin/dev' into Azure/dev
pankajsn Jan 29, 2016
9fbe613
Regenerated Session records with latest Test run.
pankajsn Jan 29, 2016
02e6cab
App.config removed
pankajsn Jan 29, 2016
90ced65
Session records updated with latest test run.
pankajsn Jan 30, 2016
8487c01
Wxi file fixed.
pankajsn Jan 30, 2016
3856b5c
Merge remote-tracking branch 'origin/dev' into dev
pankajsn Jan 30, 2016
1f6c3fb
AzurePowerShell.Test.targets updated for test integration.
pankajsn Jan 31, 2016
c4da092
Merge remote-tracking branch 'refs/remotes/origin/dev' into Azure/dev
pankajsn Feb 1, 2016
fbeaf6f
Code review comments fixed.
pankajsn Feb 1, 2016
e96d655
Code review comments fixed [Hovsep]
pankajsn Feb 2, 2016
73692cd
Merge remote-tracking branch 'upstream/dev' into dev
pankajsn Feb 4, 2016
a8fec0b
Fixing help comment
Feb 5, 2016
85f4830
Merge remote-tracking branch 'upstream/dev' into dev
pankajsn Feb 5, 2016
6195ff4
AssemblyInfo fixed
pankajsn Feb 5, 2016
3e1c180
#1779 Fix display issue for subscription with extended details
markcowl Feb 6, 2016
286947b
Resolved merge conflicts
pankajsn Feb 6, 2016
d53bf94
Merge pull request #1783 from markcowl/fixext
Feb 6, 2016
4283073
Merge pull request #1753 from pankajsn/dev
Feb 6, 2016
95849b2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Feb 6, 2016
59f49f1
Update
huangpf Feb 6, 2016
a3c34a2
Documentation terminology and typo fixes.
Feb 8, 2016
21d1aa2
Merge pull request #1782 from SiddharthChatrolaMs/dev
Feb 9, 2016
278111a
Merge pull request #1787 from torsteng/patch-1
Feb 9, 2016
3b94797
Merge pull request #388 from Azure/dev
huangpf Feb 9, 2016
d07b1eb
Fix Ext ID
huangpf Feb 9, 2016
877045e
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Feb 9, 2016
343836e
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Feb 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions AzurePowershell.Test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<OperationalInsightsTestDebug>.\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll</OperationalInsightsTestDebug>
<BatchTestDebug>.\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
<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>
<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>
Expand Down Expand Up @@ -76,6 +77,7 @@
<XUnitTests Include=".\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
Expand Down Expand Up @@ -163,6 +165,12 @@
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

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


<Target Name="TestDataFactoryManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
Expand Down
15 changes: 15 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
##2016.03.08 version 1.3.0
* Azure LogicApp: New cmdlets for managing LogicApps
* Get-AzureLogicAppAccessKey
* Get-AzureLogicApp
* Get-AzureLogicAppRunAction
* Get-AzureLogicAppRunHistory
* Get-AzureLogicAppTrigger
* Get-AzureLogicAppTriggerHistory
* New-AzureLogicApp
* Remove-AzureLogicApp
* Start-AzureLogicApp
* Set-AzureLogicAppAccessKey
* Set-AzureLogicApp
* Stop-AzureLogicAppRun

## 2016.02.04 version 1.2.1
* Fix installer issue - remove PSGallery modules on install

Expand Down
154 changes: 154 additions & 0 deletions setup/azurecmdfiles.wxi

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion src/ResourceManager.ForRefactoringOnly.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -139,6 +139,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune", "Resource
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune.Test", "ResourceManager\Intune\Commands.Intune.Test\Commands.Intune.Test.csproj", "{CA5F571B-550B-4BE3-9BA3-06442DF52768}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.LogicApp", "ResourceManager\LogicApp\Commands.LogicApp\Commands.LogicApp.csproj", "{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.LogicApp.Test", "ResourceManager\LogicApp\Commands.LogicApp.Test\Commands.LogicApp.Test.csproj", "{F1F11BB1-592B-45A3-844C-7F8A585AD107}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -401,6 +405,14 @@ Global
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.Build.0 = Release|Any CPU
{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFE4E475-B32C-4F89-9D52-F7CEBF709C74}.Release|Any CPU.Build.0 = Release|Any CPU
{F1F11BB1-592B-45A3-844C-7F8A585AD107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1F11BB1-592B-45A3-844C-7F8A585AD107}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1F11BB1-592B-45A3-844C-7F8A585AD107}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1F11BB1-592B-45A3-844C-7F8A585AD107}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -434,5 +446,6 @@ Global
{B0D03ECF-9F25-499A-BE25-D668E0D208AA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{E6122DB1-1466-47EE-8BA0-73F9CA90F826} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{CA5F571B-550B-4BE3-9BA3-06442DF52768} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{F1F11BB1-592B-45A3-844C-7F8A585AD107} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
EndGlobalSection
EndGlobal
4 changes: 4 additions & 0 deletions src/ResourceManager/LogicApp/.nuget/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit.runner.console" version="2.0.0" />
</packages>
90 changes: 90 additions & 0 deletions src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#
# Module manifest for module 'Microsoft.Azure.Commands.LogicApp'
#
# Generated by: Microsoft Corporation
#
# Generated on: 10/22/2015
#

@{

# Version number of this module.
ModuleVersion = '1.0.0'

# ID used to uniquely identify this module
GUID = '8A7D44BB-E747-4265-8F22-B3937961D709'

# Author of this module
Author = 'Microsoft Corporation'

# Company or vendor of this module
CompanyName = 'Microsoft Corporation'

# Copyright statement for this module
Copyright = 'Microsoft Corporation. All rights reserved.'

# Description of the functionality provided by this module
Description = 'Microsoft Azure PowerShell - LogicApp cmdlets for Azure Resource Manager'

# Minimum version of the Windows PowerShell engine required by this module
PowerShellVersion = '3.0'

# Name of the Windows PowerShell host required by this module
PowerShellHostName = ''

# Minimum version of the Windows PowerShell host required by this module
PowerShellHostVersion = ''

# Minimum version of the .NET Framework required by this module
DotNetFrameworkVersion = '4.0'

# Minimum version of the common language runtime (CLR) required by this module
CLRVersion='4.0'

# Processor architecture (None, X86, Amd64, IA64) required by this module
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'} )

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()

# Script files (.ps1) that are run in the caller's environment prior to importing this module
ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
TypesToProcess = @()

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = @(
'.\Microsoft.Azure.Commands.LogicApp.format.ps1xml'
)

# Modules to import as nested modules of the module specified in ModuleToProcess
NestedModules = @(
'.\Microsoft.Azure.Commands.LogicApp.dll'
)

# Functions to export from this module
FunctionsToExport = '*'

# Cmdlets to export from this module
CmdletsToExport = '*'

# Variables to export from this module
VariablesToExport = '*'

# Aliases to export from this module
AliasesToExport = @()

# List of all modules packaged with this module
ModuleList = @()

# List of all files packaged with this module
FileList = @()

# Private data to pass to the module specified in ModuleToProcess
PrivateData = ''

}
Loading