Skip to content

Commit c179165

Browse files
author
Hovsep
committed
Merge pull request Azure#2379 from daniel-ms/dev
Introducing Cognitive Services Resource Management to Azure SDK
2 parents 7a23b38 + 98a8774 commit c179165

File tree

47 files changed

+13751
-1
lines changed

Some content is hidden

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

47 files changed

+13751
-1
lines changed

‎AzurePowershell.Test.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8787
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
8888
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
89-
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
89+
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
90+
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
9091
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
9192
<XUnitTests Include="@(AsmXUnitTests)"/>
9293
</ItemGroup>

‎setup/azurecmdfiles.wxi

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,74 @@
573573
<File Id="filE46225E75692ACB5643F609EC0A0CA27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Newtonsoft.Json.dll" />
574574
</Component>
575575
</Directory>
576+
<Directory Id="dirF44F362DF1071628A1DA11B575C80698" Name="AzureRM.CognitiveServices">
577+
<Component Id="cmpE522F5AF2198DE4458E754D72B17014C" Guid="*">
578+
<File Id="fil92CF3372E11946130363E614072D1997" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\AzureRM.CognitiveServices.psd1" />
579+
</Component>
580+
<Component Id="cmpBC6F53829FE44C084F26985EC2C1F363" Guid="*">
581+
<File Id="filF7E4FFD424BE3E3A5D3553B3B64C6A07" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Hyak.Common.dll" />
582+
</Component>
583+
<Component Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" Guid="*">
584+
<File Id="filC738E5A17FE43D3B34373ABFEA7D2257" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.ApplicationInsights.dll" />
585+
</Component>
586+
<Component Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" Guid="*">
587+
<File Id="fil08C10DC9B4DE514F1CB163074C853BCF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
588+
</Component>
589+
<Component Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" Guid="*">
590+
<File Id="fil7BA91D4D0436172D383800C0533ECC57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll" />
591+
</Component>
592+
<Component Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" Guid="*">
593+
<File Id="fil863D98027AD7CAC6E27D3462144F90C5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll-Help.xml" />
594+
</Component>
595+
<Component Id="cmp56ACFA75119D58D21D6964EB62348C4B" Guid="*">
596+
<File Id="fil9D96C4594ABEEFA90D54AAE557E6D722" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
597+
</Component>
598+
<Component Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" Guid="*">
599+
<File Id="fil61F57B61B8E51BE220E642F71C55B6D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.dll" />
600+
</Component>
601+
<Component Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" Guid="*">
602+
<File Id="fil7B859483FEB0627FD4926287DB855009" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.NetFramework.dll" />
603+
</Component>
604+
<Component Id="cmp662261A272390D74C6239ACEC0BB4332" Guid="*">
605+
<File Id="fil443221C3E400D30141765C13AE2FB566" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Management.CognitiveServices.dll" />
606+
</Component>
607+
<Component Id="cmpB309A169665AB10BD9FAAB9CBF886624" Guid="*">
608+
<File Id="fil15857097CFC8CD308FE2D6591A9277CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
609+
</Component>
610+
<Component Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" Guid="*">
611+
<File Id="fil4862255DF3C5211E7256211A38B7720B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
612+
</Component>
613+
<Component Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" Guid="*">
614+
<File Id="fil2B2DE7A7D7599D1A7DAFCF1DDC6624EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
615+
</Component>
616+
<Component Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" Guid="*">
617+
<File Id="fil94F786A5D5E5D0077819178408137CED" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.dll" />
618+
</Component>
619+
<Component Id="cmp90CA956B6201BC401242CC2E4987FAB4" Guid="*">
620+
<File Id="filDD52D586F7B50293F94BC5FC92B97E80" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.dll" />
621+
</Component>
622+
<Component Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" Guid="*">
623+
<File Id="filC4CDB81C3DF37B168AB26E1084E428EA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.dll" />
624+
</Component>
625+
<Component Id="cmp3D58B962D34D7710C927C7EE5254A217" Guid="*">
626+
<File Id="filC078194E794054BC5F95E4D2B3F25DD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
627+
</Component>
628+
<Component Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" Guid="*">
629+
<File Id="fil7AC6BC928AB4233A456406A5E8AB93F2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.dll" />
630+
</Component>
631+
<Component Id="cmp173DB5569693331DDD906A1533C348B5" Guid="*">
632+
<File Id="filFEF8AE0562121D7C712692B0F8853B57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.WindowsAzure.Commands.Common.dll" />
633+
</Component>
634+
<Component Id="cmp1FF62694705D7532FA50D0C4FDB38146" Guid="*">
635+
<File Id="filE7BF2C990FC70A7D19AE35DC68AB64CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Newtonsoft.Json.dll" />
636+
</Component>
637+
<Component Id="cmp3D82D19F427B152BB3BB2BAD217958C2" Guid="*">
638+
<File Id="filE1912088D484A5582D6DC13AE9E8D207" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Extensions.dll" />
639+
</Component>
640+
<Component Id="cmpFDA0979F65585F21A39465A3177C778A" Guid="*">
641+
<File Id="filC3C2E5FE1D173E3712F1404429786B8F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Primitives.dll" />
642+
</Component>
643+
</Directory>
576644
<Directory Id="dir470D08462380F56397F9D0288EEA2E52" Name="AzureRM.Compute">
577645
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
578646
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
@@ -5536,6 +5604,28 @@
55365604
<ComponentRef Id="cmp6519C0CCA1A55C0C4F71A2D84CB100DA" />
55375605
<ComponentRef Id="cmp86B6BE57BD32B926D472B8064DAE1EB5" />
55385606
<ComponentRef Id="cmpBFE50702869E7E4BC74489AACC090CC8" />
5607+
<ComponentRef Id="cmpE522F5AF2198DE4458E754D72B17014C" />
5608+
<ComponentRef Id="cmpBC6F53829FE44C084F26985EC2C1F363" />
5609+
<ComponentRef Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" />
5610+
<ComponentRef Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" />
5611+
<ComponentRef Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" />
5612+
<ComponentRef Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" />
5613+
<ComponentRef Id="cmp56ACFA75119D58D21D6964EB62348C4B" />
5614+
<ComponentRef Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" />
5615+
<ComponentRef Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" />
5616+
<ComponentRef Id="cmp662261A272390D74C6239ACEC0BB4332" />
5617+
<ComponentRef Id="cmpB309A169665AB10BD9FAAB9CBF886624" />
5618+
<ComponentRef Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" />
5619+
<ComponentRef Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" />
5620+
<ComponentRef Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" />
5621+
<ComponentRef Id="cmp90CA956B6201BC401242CC2E4987FAB4" />
5622+
<ComponentRef Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" />
5623+
<ComponentRef Id="cmp3D58B962D34D7710C927C7EE5254A217" />
5624+
<ComponentRef Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" />
5625+
<ComponentRef Id="cmp173DB5569693331DDD906A1533C348B5" />
5626+
<ComponentRef Id="cmp1FF62694705D7532FA50D0C4FDB38146" />
5627+
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
5628+
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
55395629
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
55405630
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
55415631
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />

‎src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
#
2+
# Module manifest for module 'Microsoft.Azure.Commands.Management.CognitiveServices'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 5/18/2016
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.1.1'
16+
17+
# ID used to uniquely identify this module
18+
GUID = '66c566b4-950c-4a2b-9f3b-199d92f0df1a'
19+
20+
# Author of this module
21+
Author = 'Microsoft Corporation'
22+
23+
# Company or vendor of this module
24+
CompanyName = 'Microsoft Corporation'
25+
26+
# Copyright statement for this module
27+
Copyright = 'Microsoft Corporation. All rights reserved.'
28+
29+
# Description of the functionality provided by this module
30+
Description = 'Microsoft Azure PowerShell - Cognitive Services management cmdlets for Azure Resource Manager. Creates and manages cognitive services accounts in Azure Resource Manager.'
31+
32+
# Minimum version of the Windows PowerShell engine required by this module
33+
PowerShellVersion = '3.0'
34+
35+
# Name of the Windows PowerShell host required by this module
36+
# PowerShellHostName = ''
37+
38+
# Minimum version of the Windows PowerShell host required by this module
39+
# PowerShellHostVersion = ''
40+
41+
# Minimum version of Microsoft .NET Framework required by this module
42+
DotNetFrameworkVersion = '4.0'
43+
44+
# Minimum version of the common language runtime (CLR) required by this module
45+
CLRVersion='4.0'
46+
47+
# Processor architecture (None, X86, Amd64) required by this module
48+
# ProcessorArchitecture = ''
49+
50+
# Modules that must be imported into the global environment prior to importing this module
51+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.9'})
52+
53+
# Assemblies that must be loaded prior to importing this module
54+
# RequiredAssemblies = @()
55+
56+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
57+
# ScriptsToProcess = @()
58+
59+
# Type files (.ps1xml) to be loaded when importing this module
60+
# TypesToProcess = @()
61+
62+
# Format files (.ps1xml) to be loaded when importing this module
63+
# FormatsToProcess = @()
64+
65+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
66+
NestedModules = @('.\Microsoft.Azure.Commands.Management.CognitiveServices.dll')
67+
68+
# Functions to export from this module
69+
FunctionsToExport = '*'
70+
71+
# Cmdlets to export from this module
72+
CmdletsToExport = '*'
73+
74+
# Variables to export from this module
75+
VariablesToExport = '*'
76+
77+
# Aliases to export from this module
78+
AliasesToExport = '*'
79+
80+
# DSC resources to export from this module
81+
# DscResourcesToExport = @()
82+
83+
# List of all modules packaged with this module
84+
# ModuleList = @()
85+
86+
# List of all files packaged with this module
87+
# FileList = @()
88+
89+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
90+
PrivateData = @{
91+
92+
PSData = @{
93+
94+
# Tags applied to this module. These help with module discovery in online galleries.
95+
# Tags = @()
96+
97+
# A URL to the license for this module.
98+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
99+
100+
# A URL to the main website for this project.
101+
ProjectUri = 'https://github.com/Azure/azure-powershell'
102+
103+
# A URL to an icon representing this module.
104+
# IconUri = ''
105+
106+
# ReleaseNotes of this module
107+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
108+
109+
} # End of PSData hashtable
110+
111+
} # End of PrivateData hashtable
112+
113+
# HelpInfo URI of this module
114+
# HelpInfoURI = ''
115+
116+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
117+
# DefaultCommandPrefix = ''
118+
119+
}
120+

0 commit comments

Comments
 (0)