Skip to content

Commit 28c2115

Browse files
huangpfhuangpf
authored
Merge pull request #626 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents 4a80da2 + 8bb0ea5 commit 28c2115

File tree

41 files changed

+90888
-7539
lines changed

Some content is hidden

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

41 files changed

+90888
-7539
lines changed

‎src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.csproj

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectGuid>{EA66BF2C-4E5F-42FE-912C-B62AEB588308}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Microsoft.Azure.Commands.NotificationHubs.Test</RootNamespace>
12+
<RootNamespace>Commands.NotificationHubs.Test</RootNamespace>
1313
<AssemblyName>Microsoft.Azure.Commands.NotificationHubs.Test</AssemblyName>
1414
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
@@ -70,8 +70,8 @@
7070
<Reference Include="Microsoft.Azure.Management.Authorization">
7171
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7272
</Reference>
73-
<Reference Include="Microsoft.Azure.Management.NotificationHubs, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.NotificationHubs.0.1.0-preview\lib\portable-net45+wp8+wpa81+win\Microsoft.Azure.Management.NotificationHubs.dll</HintPath>
73+
<Reference Include="Microsoft.Azure.Management.NotificationHubs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.NotificationHubs.2.0.0-preview\lib\net45\Microsoft.Azure.Management.NotificationHubs.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -96,10 +96,18 @@
9696
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
99+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
101+
<Private>True</Private>
102+
</Reference>
99103
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100104
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
101105
<Private>True</Private>
102106
</Reference>
107+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.4.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
109+
<Private>True</Private>
110+
</Reference>
103111
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104112
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
105113
<Private>True</Private>
@@ -161,7 +169,7 @@
161169
</ItemGroup>
162170
<ItemGroup>
163171
<Compile Include="Properties\AssemblyInfo.cs" />
164-
<Compile Include="ScenarioTests\NotificationHubServiceTests.cs" />
172+
<Compile Include="ScenarioTests\NHServiceTests.cs" />
165173
<Compile Include="ScenarioTests\TestBaseClass.cs" />
166174
</ItemGroup>
167175
<ItemGroup>
@@ -174,19 +182,19 @@
174182
<None Include="Resources\NewAuthorizationRule.json">
175183
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
176184
</None>
177-
<None Include="ScenarioTests\NotificationHubServiceTests.ps1">
185+
<None Include="ScenarioTests\NHServiceTests.ps1">
178186
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
179187
</None>
180-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespace.json">
188+
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNamespace.json">
181189
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182190
</None>
183-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespaceAuth.json">
191+
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNamespaceAuth.json">
184192
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
185193
</None>
186-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNHAuth.json">
194+
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNHAuth.json">
187195
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
188196
</None>
189-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNotificationHub.json">
197+
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNotificationHub.json">
190198
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191199
</None>
192200
</ItemGroup>
@@ -200,4 +208,4 @@
200208
</ItemGroup>
201209
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
202210
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
203-
</Project>
211+
</Project>

‎src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Resources/NewAuthorizationRule.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"Name": "TestAuthRule",
3-
"PrimaryKey": "IR4qH02MB2yXjlekt5fhlgMR9YAoMsXHTkUqarUkATU=",
4-
"Rights": [
5-
"Listen",
6-
"Send"
7-
]
2+
"Name": "TestAuthRule",
3+
"Location": "South Central US",
4+
"Rights": [
5+
"Listen",
6+
"Send"
7+
]
88
}

‎src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/ScenarioTests/NotificationHubServiceTests.cs renamed to ‎src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/ScenarioTests/NHServiceTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests
15+
namespace Commands.NotificationHubs.Test
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagemenet.Common.Models;
18+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1919
using Xunit;
2020
using Xunit.Abstractions;
21-
public class NotificationHubServiceTests : TestBaseClass
21+
public class NHServiceTests : TestBaseClass
2222
{
23-
public NotificationHubServiceTests(ITestOutputHelper output)
23+
public NHServiceTests(ITestOutputHelper output)
2424
{
2525
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
2626
}

0 commit comments

Comments
 (0)