Skip to content

Commit 8d841ea

Browse files
DeepakRajendranMsftDeepakRajendranMsft
committed
Merge with release-2.0.0
2 parents 67fab66 + acdaf47 commit 8d841ea

File tree

444 files changed

+55256
-12565
lines changed

Some content is hidden

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

444 files changed

+55256
-12565
lines changed

‎AzurePowershell.Test.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<BatchTestDebug>.\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
2727
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
2828
<LogicAppTestDebug>.\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll</LogicAppTestDebug>
29+
<SchedulerTestDebug>.\src\ResourceManager\Scheduler\Commands.Scheduler.Test\bin\Debug\Microsoft.Azure.Commands.Scheduler.Test.dll</SchedulerTestDebug>
2930
<RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
3031
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
3132
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
@@ -81,6 +82,7 @@
8182
<XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
8283
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
8384
<XUnitTests Include=".\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll"/>
85+
<XUnitTests Include=".\src\ResourceManager\Scheduler\Commands.Scheduler.Test\bin\Debug\Microsoft.Azure.Commands.Scheduler.Test.dll"/>
8486
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
8587
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
8688
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
@@ -209,6 +211,10 @@
209211
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
210212
</Target>
211213

214+
<Target Name="TestScheduler">
215+
<Xunit.Runner.MSBuild.xunit Assemblies="$(SchedulerTestDebug)" Html="$(TestOutputDirectory)\SchedulerTestDebug.xunit.dll.html" Verbose="false"
216+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
217+
</Target>
212218

213219
<Target Name="TestDataFactoryManager">
214220
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - July 2016" ?>
4+
<?define productName="Microsoft Azure PowerShell - August 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.6.0" ?>
8+
<?define version="2.0.0" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,9 @@
13401340
<Component Id="cmpE2283490C2528650107F21E5322CC45F" Guid="*">
13411341
<File Id="fil2B2565F38E793D912C83693DDC08CED5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
13421342
</Component>
1343+
<Component Id="cmpDCC720F69959D24CED92ED780E7F2BDA" Guid="*">
1344+
<File Id="fil5211E67AD1FD34D82696FD4B181CD430" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Rest.ClientRuntime.Azure.dll" />
1345+
</Component>
13431346
<Component Id="cmp0EE4DF89EE2AD9E7CFD2A58C17B67AC6" Guid="*">
13441347
<File Id="fil46A2D5A3D2BAD0FF77256251FB1D89EC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Rest.ClientRuntime.dll" />
13451348
</Component>
@@ -2632,6 +2635,80 @@
26322635
<File Id="filBE0227C54B508F10C09F536EDD6BC540" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\System.Net.Http.Primitives.dll" />
26332636
</Component>
26342637
</Directory>
2638+
<Directory Id="dirA80C2E0B6C83F58BD8B627AF03F627A8" Name="AzureRM.Scheduler">
2639+
<Component Id="cmp890B1E2923E26CE2A15A652293EA92BE" Guid="*">
2640+
<File Id="filC985F59C442B87C6D54EB3051A6D5AC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\AzureRM.Scheduler.psd1" />
2641+
</Component>
2642+
<Component Id="cmpDE1CF621101635946C402ADEF203E5B8" Guid="*">
2643+
<File Id="fil2F7700C8EA9695B3B9AD5525AF56141B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Hyak.Common.dll" />
2644+
</Component>
2645+
<Component Id="cmp320C4AFCE6E1F7105B92E0D339F15AEB" Guid="*">
2646+
<File Id="filE94C829160E86F57D05613BA341F2EF1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.ApplicationInsights.dll" />
2647+
</Component>
2648+
<Component Id="cmp20C210EEF07590CC44A1D468CFF6454D" Guid="*">
2649+
<File Id="filEE3105EAB700A138829D2E4A56390D52" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Commands.Common.Authentication.dll" />
2650+
</Component>
2651+
<Component Id="cmpFC6219F103F8ED66B88E362212E1E5E0" Guid="*">
2652+
<File Id="filC14CB264F2066767CF40255D43B3E8DC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
2653+
</Component>
2654+
<Component Id="cmp55BE4765EDBEFBEF3B37D94217BCE247" Guid="*">
2655+
<File Id="fil88A6745CFC508E9FFCCA20272E2E864A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Commands.Scheduler.dll" />
2656+
</Component>
2657+
<Component Id="cmpBE88253520259EA442C9B02E0CE815AC" Guid="*">
2658+
<File Id="fil1F0075981AFD832FC93F0635AE366AB8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Commands.Scheduler.dll-Help.xml" />
2659+
</Component>
2660+
<Component Id="cmpE59E59BED081CFD12C31AEA670C01B86" Guid="*">
2661+
<File Id="fil3DAE73D0FA6144EC0763E1D79AE840B8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Commands.Scheduler.format.ps1xml" />
2662+
</Component>
2663+
<Component Id="cmp904B126C58B4BF44D1881BA0BC18DF72" Guid="*">
2664+
<File Id="fil7BFB2BF349AF3140A57A47E9AA471D5B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Common.dll" />
2665+
</Component>
2666+
<Component Id="cmp3305F8ADC1B8AF4029538FAF748C2612" Guid="*">
2667+
<File Id="filEE6395210D164433608FA49CD1F1C5C5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Common.NetFramework.dll" />
2668+
</Component>
2669+
<Component Id="cmp07ED613459F6FA004A0192DE6BBEF8C8" Guid="*">
2670+
<File Id="fil178A1D995808647A405D935AC667C62E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.Management.Scheduler.dll" />
2671+
</Component>
2672+
<Component Id="cmp8C6F23EF7CA0A8AC0510A40ECBB2F4A9" Guid="*">
2673+
<File Id="fil54833FDCF8ACB653738D142CC606AD57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Azure.ResourceManager.dll" />
2674+
</Component>
2675+
<Component Id="cmp1A2813F86F252892907392D7C7800CA0" Guid="*">
2676+
<File Id="fil94F19C575591C441075338BB83BEF021" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2677+
</Component>
2678+
<Component Id="cmpB91C060A3D8C89875B45840A9BE575DC" Guid="*">
2679+
<File Id="fil4950DC23278B8B97723926093F6A565C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
2680+
</Component>
2681+
<Component Id="cmpA56F86B6B94D1853143AA5C2F0E15857" Guid="*">
2682+
<File Id="filC90BFE3377F47B87B610D131BF543FD2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
2683+
</Component>
2684+
<Component Id="cmpC245B0B63A00DA2C7832DFCF0D368B56" Guid="*">
2685+
<File Id="filF53973B0242A3BFD97674C8DBE86C670" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Rest.ClientRuntime.Azure.dll" />
2686+
</Component>
2687+
<Component Id="cmpDA30C2EEA63875D5C3F84436E1A44226" Guid="*">
2688+
<File Id="filE99A73C71879E3F54B24DFDB9D73C8D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Rest.ClientRuntime.dll" />
2689+
</Component>
2690+
<Component Id="cmpB391F5BEF47BB4582319E1B411725741" Guid="*">
2691+
<File Id="fil566A5501C9FCA14377F821F0A7137489" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Threading.Tasks.dll" />
2692+
</Component>
2693+
<Component Id="cmp5F697E347E9DE97E04926355BB438A89" Guid="*">
2694+
<File Id="fil6F8798412B05E0D61239AA7C7006162C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
2695+
</Component>
2696+
<Component Id="cmpD53D60DFCE9509924D878266ED859F7F" Guid="*">
2697+
<File Id="filCCDCF34A11BC1424879831DB7CD57D9A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.Threading.Tasks.Extensions.dll" />
2698+
</Component>
2699+
<Component Id="cmpE3047A706A7BAF1DC08F85754EC3677A" Guid="*">
2700+
<File Id="filCDE6372F28282E0E66B6E7467F89E984" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Microsoft.WindowsAzure.Commands.Common.dll" />
2701+
</Component>
2702+
<Component Id="cmp8BEB790F5784284266572BDFFD7F6739" Guid="*">
2703+
<File Id="filFEDB278BF20F946F48D5BF06C5531BA6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\Newtonsoft.Json.dll" />
2704+
</Component>
2705+
<Component Id="cmp850C99CBFC0F5A0C1CF0B08C732176AE" Guid="*">
2706+
<File Id="fil6CD4A25184A955BF7AD56095DD218A04" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\System.Net.Http.Extensions.dll" />
2707+
</Component>
2708+
<Component Id="cmp8BC5C1C92BC4651E6AEEDFBAEB5CB075" Guid="*">
2709+
<File Id="filF764C3308A30DABD7FD9389566942B94" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Scheduler\System.Net.Http.Primitives.dll" />
2710+
</Component>
2711+
</Directory>
26352712
<Directory Id="dir14F62797AD72DE375C926D693DEB479C" Name="AzureRM.ServerManagement">
26362713
<Component Id="cmpF725005539C2C4CFDDDC204E3674DEAD" Guid="*">
26372714
<File Id="fil73381F22B6A918831220BB05A929BDF3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ServerManagement\AzureRM.ServerManagement.psd1" />
@@ -5945,6 +6022,7 @@
59456022
<ComponentRef Id="cmpA31EBC3FBAA86449DEAF89689FC84CEE" />
59466023
<ComponentRef Id="cmp089B9222CC31A3FA461B378E3AA5A317" />
59476024
<ComponentRef Id="cmpE2283490C2528650107F21E5322CC45F" />
6025+
<ComponentRef Id="cmpDCC720F69959D24CED92ED780E7F2BDA" />
59486026
<ComponentRef Id="cmp0EE4DF89EE2AD9E7CFD2A58C17B67AC6" />
59496027
<ComponentRef Id="cmp0C261034A6E6C2E4DACB359E938154CE" />
59506028
<ComponentRef Id="cmpA355BB9BD11C68FB98B54E29E074178C" />
@@ -6366,6 +6444,30 @@
63666444
<ComponentRef Id="cmp3BB1527FA803EB75EB5EC78C281B3212" />
63676445
<ComponentRef Id="cmpA534986DA2E43D7E50E9A6E219478266" />
63686446
<ComponentRef Id="cmp6D34FB8F9A9678D4511D4BB8E0800104" />
6447+
<ComponentRef Id="cmp890B1E2923E26CE2A15A652293EA92BE" />
6448+
<ComponentRef Id="cmpDE1CF621101635946C402ADEF203E5B8" />
6449+
<ComponentRef Id="cmp320C4AFCE6E1F7105B92E0D339F15AEB" />
6450+
<ComponentRef Id="cmp20C210EEF07590CC44A1D468CFF6454D" />
6451+
<ComponentRef Id="cmpFC6219F103F8ED66B88E362212E1E5E0" />
6452+
<ComponentRef Id="cmp55BE4765EDBEFBEF3B37D94217BCE247" />
6453+
<ComponentRef Id="cmpBE88253520259EA442C9B02E0CE815AC" />
6454+
<ComponentRef Id="cmpE59E59BED081CFD12C31AEA670C01B86" />
6455+
<ComponentRef Id="cmp904B126C58B4BF44D1881BA0BC18DF72" />
6456+
<ComponentRef Id="cmp3305F8ADC1B8AF4029538FAF748C2612" />
6457+
<ComponentRef Id="cmp07ED613459F6FA004A0192DE6BBEF8C8" />
6458+
<ComponentRef Id="cmp8C6F23EF7CA0A8AC0510A40ECBB2F4A9" />
6459+
<ComponentRef Id="cmp1A2813F86F252892907392D7C7800CA0" />
6460+
<ComponentRef Id="cmpB91C060A3D8C89875B45840A9BE575DC" />
6461+
<ComponentRef Id="cmpA56F86B6B94D1853143AA5C2F0E15857" />
6462+
<ComponentRef Id="cmpC245B0B63A00DA2C7832DFCF0D368B56" />
6463+
<ComponentRef Id="cmpDA30C2EEA63875D5C3F84436E1A44226" />
6464+
<ComponentRef Id="cmpB391F5BEF47BB4582319E1B411725741" />
6465+
<ComponentRef Id="cmp5F697E347E9DE97E04926355BB438A89" />
6466+
<ComponentRef Id="cmpD53D60DFCE9509924D878266ED859F7F" />
6467+
<ComponentRef Id="cmpE3047A706A7BAF1DC08F85754EC3677A" />
6468+
<ComponentRef Id="cmp8BEB790F5784284266572BDFFD7F6739" />
6469+
<ComponentRef Id="cmp850C99CBFC0F5A0C1CF0B08C732176AE" />
6470+
<ComponentRef Id="cmp8BC5C1C92BC4651E6AEEDFBAEB5CB075" />
63696471
<ComponentRef Id="cmpF725005539C2C4CFDDDC204E3674DEAD" />
63706472
<ComponentRef Id="cmpEDC95F54977C13A99FA427539106CE35" />
63716473
<ComponentRef Id="cmpFB7F0A3E01F1374D24620B3886953A33" />

‎src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
[assembly: ComVisible(false)]
3030
[assembly: CLSCompliant(false)]
31-
[assembly: AssemblyVersion("1.6.0")]
32-
[assembly: AssemblyFileVersion("1.6.0")]
31+
[assembly: AssemblyVersion("2.0.0")]
32+
[assembly: AssemblyFileVersion("2.0.0")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public virtual TClient CreateArmClient<TClient>(AzureContext context, AzureEnvir
4545
throw new ApplicationException(Resources.NoSubscriptionInContext);
4646
}
4747

48-
var creds = AzureSession.AuthenticationFactory.GetServiceClientCredentials(context);
48+
var creds = AzureSession.AuthenticationFactory.GetServiceClientCredentials(context, endpoint);
4949
var newHandlers = GetCustomHandlers();
5050
TClient client = (newHandlers == null || newHandlers.Length == 0)
5151
? CreateCustomArmClient<TClient>(context.Environment.GetEndpointAsUri(endpoint), creds)

‎src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("1.6.0")]
50-
[assembly: AssemblyFileVersion("1.6.0")]
49+
[assembly: AssemblyVersion("2.0.0")]
50+
[assembly: AssemblyFileVersion("2.0.0")]

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("1.6.0")]
28-
[assembly: AssemblyFileVersion("1.6.0")]
27+
[assembly: AssemblyVersion("2.0.0")]
28+
[assembly: AssemblyFileVersion("2.0.0")]

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "1.6.0";
29+
public const string AssemblyVersion = "2.0.0";
3030

31-
public const string AssemblyFileVersion = "1.6.0";
31+
public const string AssemblyFileVersion = "2.0.0";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

‎src/Common/Commands.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
28-
[assembly: AssemblyVersion("1.6.0")]
29-
[assembly: AssemblyFileVersion("1.6.0")]
28+
[assembly: AssemblyVersion("2.0.0")]
29+
[assembly: AssemblyFileVersion("2.0.0")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.6.0")]
36-
[assembly: AssemblyFileVersion("1.6.0")]
35+
[assembly: AssemblyVersion("2.0.0")]
36+
[assembly: AssemblyFileVersion("2.0.0")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.1.3'
12+
ModuleVersion = '2.0.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.11'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.0.0'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

0 commit comments

Comments
 (0)