Skip to content

Commit 76a6f9c

Browse files
huangpfhuangpf
authored
Merge pull request Azure#566 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents c6ec32c + bdb7a53 commit 76a6f9c

File tree

58 files changed

+15872
-3854
lines changed

Some content is hidden

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

58 files changed

+15872
-3854
lines changed

‎AzurePowershell.Test.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
3535
<DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>
3636
<UsageAggregationTestDebug>.\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
37+
<PowerBIEmbeddedTestDebug>.\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll</PowerBIEmbeddedTestDebug>
3738
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
3839
<ScenarioTestFilter>All</ScenarioTestFilter>
3940
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
@@ -89,6 +90,7 @@
8990
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
9091
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
9192
<XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
93+
<XUnitTests Include=".\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"/>
9294
<!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
9395
<XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
9496
<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
@@ -321,6 +323,13 @@
321323
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataLakeStoreTestDebug)" Html="$(TestOutputDirectory)\DataLakeStoreTests.xunit.dll.html" Verbose="true"
322324
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
323325
</Target>
326+
327+
<!-- Run the Power BI Embedded tests -->
328+
<Target Name="PowerBIEmbeddedTests">
329+
<Message Importance="high" Text="Running Power BI Embedded tests" />
330+
<Xunit.Runner.MSBuild.xunit Assemblies="$(PowerBIEmbeddedTestDebug)" Html="$(TestOutputDirectory)\PowerBIEmbeddedTestDebug.xunit.dll.html" Verbose="true"
331+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
332+
</Target>
324333

325334
<!-- run the UsageAggregationTests -->
326335
<Target Name="UsageAggregationTests">

‎setup/azurecmdfiles.wxi

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,6 +2081,74 @@
20812081
<File Id="filA76A8328AE433E2C5232F8657545A5BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\System.Net.Http.Primitives.dll" />
20822082
</Component>
20832083
</Directory>
2084+
<Directory Id="dirC613916180ACDDF6B9274AA9594F6560" Name="AzureRM.PowerBIEmbedded">
2085+
<Component Id="cmp07ACD4A07ADD8A358045C237522DA4C4" Guid="*">
2086+
<File Id="fil1326C81C058BA9B188CE068472C2DF60" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\AzureRM.PowerBIEmbedded.psd1" />
2087+
</Component>
2088+
<Component Id="cmp8E9ADEDEC5D48B80376BB1BCEDB381BB" Guid="*">
2089+
<File Id="fil5322BB3EA9130E81D59E6049EFFF4786" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Hyak.Common.dll" />
2090+
</Component>
2091+
<Component Id="cmp000B8EDD9C6216C0B2244154FF60B510" Guid="*">
2092+
<File Id="fil5EE1AFB7CC50C4DFB26364FD8E45183B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.ApplicationInsights.dll" />
2093+
</Component>
2094+
<Component Id="cmpC80C33F266BD759B1373018B08EAB098" Guid="*">
2095+
<File Id="fil5F7B71A82C4482EB24C81A8605B94E5D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Common.Authentication.dll" />
2096+
</Component>
2097+
<Component Id="cmp0F1E11B5C6A0C1527BB960FDCC4F4F34" Guid="*">
2098+
<File Id="fil525A04CD8B9919F794C5C10740F9D89A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll" />
2099+
</Component>
2100+
<Component Id="cmpA7B72722B1AC91C0B6B117CEAB00E3C0" Guid="*">
2101+
<File Id="fil40386C22E607E953293F5632EAC6393E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll-Help.xml" />
2102+
</Component>
2103+
<Component Id="cmp2EADFCD6F716F27786217F2880D84173" Guid="*">
2104+
<File Id="fil0EA7DFE5D1B5B49590DA1A6E57CC0D95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
2105+
</Component>
2106+
<Component Id="cmp4FEC00F10475E073AD74B36CEDE692D5" Guid="*">
2107+
<File Id="fil711D2D4DE6953BC502E146FED96CC53B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Common.dll" />
2108+
</Component>
2109+
<Component Id="cmp7A9ACF44DF74CCBEE65ACEF64A8D4BF7" Guid="*">
2110+
<File Id="fil855E6EBE047AA7863D3742D3D51FCFC6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Common.NetFramework.dll" />
2111+
</Component>
2112+
<Component Id="cmpCE88A6EB381A0717BB0174CE2088DAC0" Guid="*">
2113+
<File Id="filFF22B8B40E8E77E1A41A01AB2CE44D87" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Azure.Management.PowerBIEmbedded.dll" />
2114+
</Component>
2115+
<Component Id="cmp397B4551DF9E338CCC8CCDB595331094" Guid="*">
2116+
<File Id="filED96393B1571E9D5B5B467062212ECC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2117+
</Component>
2118+
<Component Id="cmp729FD57580E2AB78200B412A9365DAC7" Guid="*">
2119+
<File Id="fil97F457E30B3D8008DC1F46DB4416F769" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
2120+
</Component>
2121+
<Component Id="cmp145E2E2149B0B39F3E17936846B0D643" Guid="*">
2122+
<File Id="filDCB947927D0CDD1030919C4992C43686" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
2123+
</Component>
2124+
<Component Id="cmp70A2BE523812E016CC27971061216FAA" Guid="*">
2125+
<File Id="filDA61EE632878D2A5D915967D9F1B1C95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.Azure.dll" />
2126+
</Component>
2127+
<Component Id="cmp9283719AA2CA4560433AF1A1E43D12F0" Guid="*">
2128+
<File Id="fil753E4DD5F027DFF2B7569AE566778E42" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Rest.ClientRuntime.dll" />
2129+
</Component>
2130+
<Component Id="cmpF55B95F6BDBFD277964CF7D6B1A7BB54" Guid="*">
2131+
<File Id="filAC72CD69E6651E8A568355C3C2341B00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.dll" />
2132+
</Component>
2133+
<Component Id="cmp52C55C56630CDDAE79C6858A204BCCA8" Guid="*">
2134+
<File Id="fil9C01B4CBDCA09E8E763AE117F5881476" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
2135+
</Component>
2136+
<Component Id="cmpFE9716D71D563F23E402B87AD6A3E65D" Guid="*">
2137+
<File Id="filDFCF946710618B93335E67AA02F21346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.Threading.Tasks.Extensions.dll" />
2138+
</Component>
2139+
<Component Id="cmpA8F9920BABC4B21F8CFC6371C2B4C278" Guid="*">
2140+
<File Id="filDB2E4FCF7F6AB81F68CC6E88B7FA8040" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Microsoft.WindowsAzure.Commands.Common.dll" />
2141+
</Component>
2142+
<Component Id="cmpC90757BC5869E371D6A93B16B6CE0193" Guid="*">
2143+
<File Id="fil4FBED2916CD223750C33099F2C43028A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\Newtonsoft.Json.dll" />
2144+
</Component>
2145+
<Component Id="cmp6B2CB6089B5B3E1ACC9DE04F301AA594" Guid="*">
2146+
<File Id="fil4772B79761E070816C9F973329CC86F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\System.Net.Http.Extensions.dll" />
2147+
</Component>
2148+
<Component Id="cmpAEE0BBCF0220365A089D7B8797E01190" Guid="*">
2149+
<File Id="fil4A5E95070D04DECCB68228C14582A509" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.PowerBIEmbedded\System.Net.Http.Primitives.dll" />
2150+
</Component>
2151+
</Directory>
20842152
<Directory Id="dir4395B471E6DFAD4EF5810AAA6A09D202" Name="AzureRM.Profile">
20852153
<Component Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" Guid="*">
20862154
<File Id="fil3DAF3370A0C8515C0D6D1D2B587FC47D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1" />
@@ -6096,6 +6164,28 @@
60966164
<ComponentRef Id="cmpFD405A18E2A1C755986CD15E7976CCD9" />
60976165
<ComponentRef Id="cmpD895804B1147D0DB74C81C5C228D8CFA" />
60986166
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
6167+
<ComponentRef Id="cmp07ACD4A07ADD8A358045C237522DA4C4" />
6168+
<ComponentRef Id="cmp8E9ADEDEC5D48B80376BB1BCEDB381BB" />
6169+
<ComponentRef Id="cmp000B8EDD9C6216C0B2244154FF60B510" />
6170+
<ComponentRef Id="cmpC80C33F266BD759B1373018B08EAB098" />
6171+
<ComponentRef Id="cmp0F1E11B5C6A0C1527BB960FDCC4F4F34" />
6172+
<ComponentRef Id="cmpA7B72722B1AC91C0B6B117CEAB00E3C0" />
6173+
<ComponentRef Id="cmp2EADFCD6F716F27786217F2880D84173" />
6174+
<ComponentRef Id="cmp4FEC00F10475E073AD74B36CEDE692D5" />
6175+
<ComponentRef Id="cmp7A9ACF44DF74CCBEE65ACEF64A8D4BF7" />
6176+
<ComponentRef Id="cmpCE88A6EB381A0717BB0174CE2088DAC0" />
6177+
<ComponentRef Id="cmp397B4551DF9E338CCC8CCDB595331094" />
6178+
<ComponentRef Id="cmp729FD57580E2AB78200B412A9365DAC7" />
6179+
<ComponentRef Id="cmp145E2E2149B0B39F3E17936846B0D643" />
6180+
<ComponentRef Id="cmp70A2BE523812E016CC27971061216FAA" />
6181+
<ComponentRef Id="cmp9283719AA2CA4560433AF1A1E43D12F0" />
6182+
<ComponentRef Id="cmpF55B95F6BDBFD277964CF7D6B1A7BB54" />
6183+
<ComponentRef Id="cmp52C55C56630CDDAE79C6858A204BCCA8" />
6184+
<ComponentRef Id="cmpFE9716D71D563F23E402B87AD6A3E65D" />
6185+
<ComponentRef Id="cmpA8F9920BABC4B21F8CFC6371C2B4C278" />
6186+
<ComponentRef Id="cmpC90757BC5869E371D6A93B16B6CE0193" />
6187+
<ComponentRef Id="cmp6B2CB6089B5B3E1ACC9DE04F301AA594" />
6188+
<ComponentRef Id="cmpAEE0BBCF0220365A089D7B8797E01190" />
60996189
<ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
61006190
<ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
61016191
<ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,11 @@
333333
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DscExtensionTests\TestGetAzureRmVMDscExtension.json">
334334
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
335335
</None>
336+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests\TestSqlIaaSAKVExtension.json">
337+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
338+
</None>
336339
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests\TestSqlIaaSExtension.json">
337-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
340+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
338341
</None>
339342
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineBootDiagnosticsTests\TestLinuxVirtualMachineBootDiagnostics.json">
340343
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,22 @@ public ComputeTestController()
7676
helper = new EnvironmentSetupHelper();
7777
}
7878

79+
public void RunPsTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)
80+
{
81+
var callingClassType = TestUtilities.GetCallingClass(2);
82+
var mockName = TestUtilities.GetCurrentMethodName(2);
83+
84+
helper.TracingInterceptor = logger;
85+
RunPsTestWorkflow(
86+
() => scripts,
87+
// no custom initializer
88+
null,
89+
// no custom cleanup
90+
null,
91+
callingClassType,
92+
mockName);
93+
}
94+
7995
public void RunPsTest(params string[] scripts)
8096
{
8197
var callingClassType = TestUtilities.GetCallingClass(2);

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/SqlIaaSExtensionTests.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,26 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
55
{
66
public class SqlIaaSExtensionTests
77
{
8+
ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
89
public SqlIaaSExtensionTests(Xunit.Abstractions.ITestOutputHelper output)
910
{
10-
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
11+
_logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
12+
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
1113
}
1214

1315
[Fact]
1416
[Trait(Category.AcceptanceType, Category.CheckIn)]
1517
public void TestSqlIaaSExtension()
1618
{
17-
ComputeTestController.NewInstance.RunPsTest("Test-SetAzureRmVMSqlServerExtension");
19+
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SetAzureRmVMSqlServerExtension");
1820
}
21+
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestSqlIaaSAKVExtension()
25+
{
26+
ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SetAzureRmVMSqlServerAKVExtension");
27+
}
28+
1929
}
2030
}

0 commit comments

Comments
 (0)