Skip to content

huangpf PR: dev <- Azure:dev #626

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.

Sign up for GitHub

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 10 commits into from
Oct 8, 2016
Merged

huangpf PR: dev <- Azure:dev #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0662a02
NH change in sas Rules and Regenerate Key api : net sdk 2.0.0
smithaborkar Sep 27, 2016
5d0fa42
Added the ShouldProcess flag
smithaborkar Sep 30, 2016
6466750
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
smithaborkar Sep 30, 2016
c1d2519
Update the Rest.clientRuntime.Azure package
smithaborkar Oct 3, 2016
2cdb67e
updated the test
smithaborkar Oct 4, 2016
cebd4f3
updated the test
smithaborkar Oct 4, 2016
9081063
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
smithaborkar Oct 4, 2016
204e67b
Reduced the folder path size
smithaborkar Oct 4, 2016
4f75ccc
Fixed the RecordsDirectory path
smithaborkar Oct 4, 2016
8bb0ea5
Merge pull request #3016 from smithab/dev
cormacpayne Oct 7, 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
28 changes: 18 additions & 10 deletions ...ger/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectGuid>{EA66BF2C-4E5F-42FE-912C-B62AEB588308}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Azure.Commands.NotificationHubs.Test</RootNamespace>
<RootNamespace>Commands.NotificationHubs.Test</RootNamespace>
<AssemblyName>Microsoft.Azure.Commands.NotificationHubs.Test</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -70,8 +70,8 @@
<Reference Include="Microsoft.Azure.Management.Authorization">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.NotificationHubs, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.NotificationHubs.0.1.0-preview\lib\portable-net45+wp8+wpa81+win\Microsoft.Azure.Management.NotificationHubs.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.NotificationHubs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.NotificationHubs.2.0.0-preview\lib\net45\Microsoft.Azure.Management.NotificationHubs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -96,10 +96,18 @@
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.4.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -161,7 +169,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScenarioTests\NotificationHubServiceTests.cs" />
<Compile Include="ScenarioTests\NHServiceTests.cs" />
<Compile Include="ScenarioTests\TestBaseClass.cs" />
</ItemGroup>
<ItemGroup>
Expand All @@ -174,19 +182,19 @@
<None Include="Resources\NewAuthorizationRule.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\NotificationHubServiceTests.ps1">
<None Include="ScenarioTests\NHServiceTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespace.json">
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNamespace.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespaceAuth.json">
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNamespaceAuth.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNHAuth.json">
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNHAuth.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNotificationHub.json">
<None Include="SessionRecords\Commands.NotificationHubs.Test.NHServiceTests\TestCRUDNotificationHub.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand All @@ -200,4 +208,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project>
</Project>
12 changes: 6 additions & 6 deletions ...nager/NotificationHubs/Commands.NotificationHubs.Test/Resources/NewAuthorizationRule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Name": "TestAuthRule",
"PrimaryKey": "IR4qH02MB2yXjlekt5fhlgMR9YAoMsXHTkUqarUkATU=",
"Rights": [
"Listen",
"Send"
]
"Name": "TestAuthRule",
"Location": "South Central US",
"Rights": [
"Listen",
"Send"
]
}
8 changes: 4 additions & 4 deletions ...narioTests/NotificationHubServiceTests.cs → ...Hubs.Test/ScenarioTests/NHServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

namespace Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests
namespace Commands.NotificationHubs.Test
{
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using ServiceManagemenet.Common.Models;
using Microsoft.Azure.ServiceManagemenet.Common.Models;
using Xunit;
using Xunit.Abstractions;
public class NotificationHubServiceTests : TestBaseClass
public class NHServiceTests : TestBaseClass
{
public NotificationHubServiceTests(ITestOutputHelper output)
public NHServiceTests(ITestOutputHelper output)
{
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
}
Expand Down
Loading