Skip to content

huangpf PR: dev <- Azure:dev #566

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 23 commits into from
Jun 29, 2016
Merged

huangpf PR: dev <- Azure:dev #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
93d9c5c
Initial commit for pbie powershell
May 11, 2016
4b72a88
Updated powershell module xml documentation
Jun 6, 2016
9b40e28
Removed referenced to extra unused dependencies
Jun 6, 2016
c63cb25
Updated installer wxi file
Jun 6, 2016
5a45df2
Updated package references to target latest autorest client runtime
Jun 8, 2016
4413a13
Removed unnesscary code and dependencies
Jun 17, 2016
c71fad4
Removed unnesscary dependencies and nuget packages
Jun 17, 2016
88be0fd
Updated wix files
Jun 17, 2016
e31b637
Updated depdendent pacakges to match expected versions
Jun 22, 2016
0947e94
Added reference to Hyak.Common and removed app.config from commands p…
Jun 23, 2016
6dcb90d
Removed app.config reference from code & test projects
Jun 23, 2016
89936b8
Updated reference to Hyak.Common to reference version 1.0.3
Jun 23, 2016
6de846a
Removed app.config from the test project file
Jun 23, 2016
11d621f
Added Power BI tests to run as part of build
Jun 24, 2016
0a6a9ac
Address code review feedback
Jun 24, 2016
edf5040
Re-add the DefaultCommandPrefix
Jun 24, 2016
cdf3589
Downgraded Newtonsoft.Json to 6.0.8 to match expected version.
Jun 27, 2016
1dcb269
Regenerated session records
Jun 27, 2016
40d7959
Removed module prefix, updated command names and updated help docs
Jun 27, 2016
3e4b8e3
azure-powershell akv test case
tlaoMicrosoft Jun 28, 2016
0f04f4c
file name and test format fix
tlaoMicrosoft Jun 29, 2016
ab80a66
Merge pull request #2411 from wbreza/powerbi-embedded
markcowl Jun 29, 2016
bdb7a53
Merge pull request #2479 from tlao33/dev
markcowl Jun 29, 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
9 changes: 9 additions & 0 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
<DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>
<UsageAggregationTestDebug>.\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
<PowerBIEmbeddedTestDebug>.\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll</PowerBIEmbeddedTestDebug>
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
<ScenarioTestFilter>All</ScenarioTestFilter>
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
Expand Down Expand Up @@ -89,6 +90,7 @@
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"/>
<!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
Expand Down Expand Up @@ -321,6 +323,13 @@
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataLakeStoreTestDebug)" Html="$(TestOutputDirectory)\DataLakeStoreTests.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- Run the Power BI Embedded tests -->
<Target Name="PowerBIEmbeddedTests">
<Message Importance="high" Text="Running Power BI Embedded tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(PowerBIEmbeddedTestDebug)" Html="$(TestOutputDirectory)\PowerBIEmbeddedTestDebug.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<!-- run the UsageAggregationTests -->
<Target Name="UsageAggregationTests">
Expand Down
90 changes: 90 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,74 @@
<File Id="filA76A8328AE433E2C5232F8657545A5BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\System.Net.Http.Primitives.dll" />
</Component>
</Directory>
<Directory Id="dirC613916180ACDDF6B9274AA9594F6560" Name="AzureRM.PowerBIEmbedded">
<Component Id="cmp07ACD4A07ADD8A358045C237522DA4C4" Guid="*">
<File Id="fil1326C81C058BA9B188CE068472C2DF60" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\AzureRM.PowerBIEmbedded.psd1" />
</Component>
<Component Id="cmp8E9ADEDEC5D48B80376BB1BCEDB381BB" Guid="*">
<File Id="fil5322BB3EA9130E81D59E6049EFFF4786" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Hyak.Common.dll" />
</Component>
<Component Id="cmp000B8EDD9C6216C0B2244154FF60B510" Guid="*">
<File Id="fil5EE1AFB7CC50C4DFB26364FD8E45183B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.ApplicationInsights.dll" />
</Component>
<Component Id="cmpC80C33F266BD759B1373018B08EAB098" Guid="*">
<File Id="fil5F7B71A82C4482EB24C81A8605B94E5D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Common.Authentication.dll" />
</Component>
<Component Id="cmp0F1E11B5C6A0C1527BB960FDCC4F4F34" Guid="*">
<File Id="fil525A04CD8B9919F794C5C10740F9D89A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll" />
</Component>
<Component Id="cmpA7B72722B1AC91C0B6B117CEAB00E3C0" Guid="*">
<File Id="fil40386C22E607E953293F5632EAC6393E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll-Help.xml" />
</Component>
<Component Id="cmp2EADFCD6F716F27786217F2880D84173" Guid="*">
<File Id="fil0EA7DFE5D1B5B49590DA1A6E57CC0D95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
<Component Id="cmp4FEC00F10475E073AD74B36CEDE692D5" Guid="*">
<File Id="fil711D2D4DE6953BC502E146FED96CC53B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmp7A9ACF44DF74CCBEE65ACEF64A8D4BF7" Guid="*">
<File Id="fil855E6EBE047AA7863D3742D3D51FCFC6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmpCE88A6EB381A0717BB0174CE2088DAC0" Guid="*">
<File Id="filFF22B8B40E8E77E1A41A01AB2CE44D87" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Management.PowerBIEmbedded.dll" />
</Component>
<Component Id="cmp397B4551DF9E338CCC8CCDB595331094" Guid="*">
<File Id="filED96393B1571E9D5B5B467062212ECC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmp729FD57580E2AB78200B412A9365DAC7" Guid="*">
<File Id="fil97F457E30B3D8008DC1F46DB4416F769" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmp145E2E2149B0B39F3E17936846B0D643" Guid="*">
<File Id="filDCB947927D0CDD1030919C4992C43686" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmp70A2BE523812E016CC27971061216FAA" Guid="*">
<File Id="filDA61EE632878D2A5D915967D9F1B1C95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.Azure.dll" />
</Component>
<Component Id="cmp9283719AA2CA4560433AF1A1E43D12F0" Guid="*">
<File Id="fil753E4DD5F027DFF2B7569AE566778E42" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.dll" />
</Component>
<Component Id="cmpF55B95F6BDBFD277964CF7D6B1A7BB54" Guid="*">
<File Id="filAC72CD69E6651E8A568355C3C2341B00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.dll" />
</Component>
<Component Id="cmp52C55C56630CDDAE79C6858A204BCCA8" Guid="*">
<File Id="fil9C01B4CBDCA09E8E763AE117F5881476" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
</Component>
<Component Id="cmpFE9716D71D563F23E402B87AD6A3E65D" Guid="*">
<File Id="filDFCF946710618B93335E67AA02F21346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.Extensions.dll" />
</Component>
<Component Id="cmpA8F9920BABC4B21F8CFC6371C2B4C278" Guid="*">
<File Id="filDB2E4FCF7F6AB81F68CC6E88B7FA8040" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmpC90757BC5869E371D6A93B16B6CE0193" Guid="*">
<File Id="fil4FBED2916CD223750C33099F2C43028A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmp6B2CB6089B5B3E1ACC9DE04F301AA594" Guid="*">
<File Id="fil4772B79761E070816C9F973329CC86F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\System.Net.Http.Extensions.dll" />
</Component>
<Component Id="cmpAEE0BBCF0220365A089D7B8797E01190" Guid="*">
<File Id="fil4A5E95070D04DECCB68228C14582A509" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\System.Net.Http.Primitives.dll" />
</Component>
</Directory>
<Directory Id="dir4395B471E6DFAD4EF5810AAA6A09D202" Name="AzureRM.Profile">
<Component Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" Guid="*">
<File Id="fil3DAF3370A0C8515C0D6D1D2B587FC47D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1" />
Expand Down Expand Up @@ -6096,6 +6164,28 @@
<ComponentRef Id="cmpFD405A18E2A1C755986CD15E7976CCD9" />
<ComponentRef Id="cmpD895804B1147D0DB74C81C5C228D8CFA" />
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
<ComponentRef Id="cmp07ACD4A07ADD8A358045C237522DA4C4" />
<ComponentRef Id="cmp8E9ADEDEC5D48B80376BB1BCEDB381BB" />
<ComponentRef Id="cmp000B8EDD9C6216C0B2244154FF60B510" />
<ComponentRef Id="cmpC80C33F266BD759B1373018B08EAB098" />
<ComponentRef Id="cmp0F1E11B5C6A0C1527BB960FDCC4F4F34" />
<ComponentRef Id="cmpA7B72722B1AC91C0B6B117CEAB00E3C0" />
<ComponentRef Id="cmp2EADFCD6F716F27786217F2880D84173" />
<ComponentRef Id="cmp4FEC00F10475E073AD74B36CEDE692D5" />
<ComponentRef Id="cmp7A9ACF44DF74CCBEE65ACEF64A8D4BF7" />
<ComponentRef Id="cmpCE88A6EB381A0717BB0174CE2088DAC0" />
<ComponentRef Id="cmp397B4551DF9E338CCC8CCDB595331094" />
<ComponentRef Id="cmp729FD57580E2AB78200B412A9365DAC7" />
<ComponentRef Id="cmp145E2E2149B0B39F3E17936846B0D643" />
<ComponentRef Id="cmp70A2BE523812E016CC27971061216FAA" />
<ComponentRef Id="cmp9283719AA2CA4560433AF1A1E43D12F0" />
<ComponentRef Id="cmpF55B95F6BDBFD277964CF7D6B1A7BB54" />
<ComponentRef Id="cmp52C55C56630CDDAE79C6858A204BCCA8" />
<ComponentRef Id="cmpFE9716D71D563F23E402B87AD6A3E65D" />
<ComponentRef Id="cmpA8F9920BABC4B21F8CFC6371C2B4C278" />
<ComponentRef Id="cmpC90757BC5869E371D6A93B16B6CE0193" />
<ComponentRef Id="cmp6B2CB6089B5B3E1ACC9DE04F301AA594" />
<ComponentRef Id="cmpAEE0BBCF0220365A089D7B8797E01190" />
<ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
<ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
<ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />
Expand Down
5 changes: 4 additions & 1 deletion src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,11 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DscExtensionTests\TestGetAzureRmVMDscExtension.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests\TestSqlIaaSAKVExtension.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests\TestSqlIaaSExtension.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineBootDiagnosticsTests\TestLinuxVirtualMachineBootDiagnostics.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
16 changes: 16 additions & 0 deletions src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,22 @@ public ComputeTestController()
helper = new EnvironmentSetupHelper();
}

public void RunPsTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)
{
var callingClassType = TestUtilities.GetCallingClass(2);
var mockName = TestUtilities.GetCurrentMethodName(2);

helper.TracingInterceptor = logger;
RunPsTestWorkflow(
() => scripts,
// no custom initializer
null,
// no custom cleanup
null,
callingClassType,
mockName);
}

public void RunPsTest(params string[] scripts)
{
var callingClassType = TestUtilities.GetCallingClass(2);
Expand Down
14 changes: 12 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/SqlIaaSExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,26 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
{
public class SqlIaaSExtensionTests
{
ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
public SqlIaaSExtensionTests(Xunit.Abstractions.ITestOutputHelper output)
{
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
_logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestSqlIaaSExtension()
{
ComputeTestController.NewInstance.RunPsTest("Test-SetAzureRmVMSqlServerExtension");
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SetAzureRmVMSqlServerExtension");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestSqlIaaSAKVExtension()
{
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SetAzureRmVMSqlServerAKVExtension");
}

}
}
Loading