Skip to content

Commit d33d22b

Browse files
committed
Merge pull request #4 from Azure/dev
.
2 parents 45dfa3b + ef4fb6f commit d33d22b

File tree

15 files changed

+3773
-3967
lines changed

15 files changed

+3773
-3967
lines changed

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.StreamAnalytics">
65-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.17.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.1.4.1\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Resources/Input.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"PathPattern": "",
2424
"DateFormat": "yyyy/MM/dd",
2525
"TimeFormat": "HH",
26-
"SourcePartitionCount": null,
27-
"blobSerializationBoundary": "BlobBoundary"
26+
"SourcePartitionCount": null
2827
}
2928
}
3029
}

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/EndToEndTests.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ function Test-TestStreamingAnalyticsE2E
7878
$expected = 1
7979
Assert-AreEqual $expected $actual.CurrentCount
8080

81+
#Get Diagnostics
82+
$actual = Get-AzureStreamAnalyticsInput -JobName $jobName -ResourceGroupName $resourceGroup
83+
Assert-NotNull $actual
84+
Assert-NotNull $actual.Properties.Diagnostics
85+
Assert-NotNull $actual.Properties.Diagnostics.Conditions
86+
Assert-NotNull $actual.Properties.Diagnostics.Conditions.Message
87+
8188
# Stop Job
8289
$actual = Stop-AzureStreamAnalyticsJob -Name $jobName -ResourceGroupName $resourceGroup
8390
$expected = "True"

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.StreamAnalytics.Test.EndToEndTests/TestStreamingAnalyticsE2E.json

Lines changed: 355 additions & 361 deletions
Large diffs are not rendered by default.

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.17.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.StreamAnalytics" version="1.4.1" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.StreamAnalytics, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.17.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.1.4.1\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#
2+
# Module manifest for module 'Microsoft.Azure.Commands.Compute'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 04/01/2015
7+
#
8+
9+
@{
10+
11+
# Version number of this module.
12+
ModuleVersion = '0.0.1'
13+
14+
# ID used to uniquely identify this module
15+
GUID = '5AB0BA73-DCD1-4EF8-B1DB-D207F97BE199'
16+
17+
# Author of this module
18+
Author = 'Microsoft Corporation'
19+
20+
# Company or vendor of this module
21+
CompanyName = 'Microsoft Corporation'
22+
23+
# Copyright statement for this module
24+
Copyright = '© Microsoft Corporation. All rights reserved.'
25+
26+
# Description of the functionality provided by this module
27+
Description = ''
28+
29+
# Minimum version of the Windows PowerShell engine required by this module
30+
PowerShellVersion = '3.0'
31+
32+
# Name of the Windows PowerShell host required by this module
33+
PowerShellHostName = ''
34+
35+
# Minimum version of the Windows PowerShell host required by this module
36+
PowerShellHostVersion = ''
37+
38+
# Minimum version of the .NET Framework required by this module
39+
DotNetFrameworkVersion = '4.0'
40+
41+
# Minimum version of the common language runtime (CLR) required by this module
42+
CLRVersion='4.0'
43+
44+
# Processor architecture (None, X86, Amd64, IA64) required by this module
45+
ProcessorArchitecture = 'None'
46+
47+
# Modules that must be imported into the global environment prior to importing this module
48+
RequiredModules = @()
49+
50+
# Assemblies that must be loaded prior to importing this module
51+
RequiredAssemblies = @()
52+
53+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
54+
ScriptsToProcess = @()
55+
56+
# Format files (.ps1xml) to be loaded when importing this module
57+
FormatsToProcess = @(
58+
'..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml'
59+
)
60+
61+
# Modules to import as nested modules of the module specified in ModuleToProcess
62+
NestedModules = @(
63+
'..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll'
64+
)
65+
66+
# Functions to export from this module
67+
FunctionsToExport = '*'
68+
69+
# Cmdlets to export from this module
70+
CmdletsToExport = '*'
71+
72+
# Variables to export from this module
73+
VariablesToExport = '*'
74+
75+
# Aliases to export from this module
76+
AliasesToExport = @()
77+
78+
# List of all modules packaged with this module
79+
ModuleList = @()
80+
81+
# List of all files packaged with this module
82+
FileList = @()
83+
84+
# Private data to pass to the module specified in ModuleToProcess
85+
PrivateData = ''
86+
87+
}

0 commit comments

Comments
 (0)