Skip to content

Commit 2cbed85

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'crp2' of https://github.com/AzureRT/azure-powershell-pr into crp2
2 parents 1ea5d15 + 32f15a7 commit 2cbed85

File tree

14 files changed

+38
-45
lines changed

14 files changed

+38
-45
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
<Reference Include="Microsoft.Azure.Common">
4949
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
51+
<Reference Include="Microsoft.Azure.Common.Authentication">
52+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5453
</Reference>
5554
<Reference Include="Microsoft.Azure.Common.NetFramework">
5655
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -63,7 +62,10 @@
6362
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6463
</Reference>
6564
<Reference Include="Microsoft.Azure.Management.Authorization">
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.Azure.Management.Compute">
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
6769
</Reference>
6870
<Reference Include="Microsoft.Azure.ResourceManager">
6971
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -94,12 +96,7 @@
9496
<SpecificVersion>False</SpecificVersion>
9597
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
9698
</Reference>
97-
<Reference Include="Microsoft.Azure.Management.Compute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Compute.dll</HintPath>
100-
</Reference>
101-
<Reference Include="Microsoft.Azure.Management.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102-
<SpecificVersion>False</SpecificVersion>
99+
<Reference Include="Microsoft.Azure.Management.Network">
103100
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Network.dll</HintPath>
104101
</Reference>
105102
<Reference Include="Microsoft.Azure.Management.Storage">

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.21-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.1-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Compute" version="3.4.0-preview" targetFramework="net45" />
1011
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1112
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1213
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<Reference Include="Microsoft.Azure.Common">
5555
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Microsoft.Azure.Common.Authentication">
57+
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Common.NetFramework">
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -69,8 +69,10 @@
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.Management.Authorization">
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
73-
<Private>True</Private>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Microsoft.Azure.Management.Compute">
75+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7476
</Reference>
7577
<Reference Include="Microsoft.Azure.ResourceManager">
7678
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -119,9 +121,6 @@
119121
<Reference Include="System.Data" />
120122
<Reference Include="System.Xml" />
121123
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
122-
<Reference Include="Microsoft.Azure.Management.Compute">
123-
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Compute.dll</HintPath>
124-
</Reference>
125124
<Reference Include="Microsoft.Azure.Management.Storage">
126125
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Storage.dll</HintPath>
127126
</Reference>

‎src/ResourceManager/Compute/Commands.Compute/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
using System.Runtime.CompilerServices;
1818
using System.Runtime.InteropServices;
1919

20-
[assembly: AssemblyTitle("Microsoft Azure Powershell - Compute Resource Manager")]
21-
[assembly: AssemblyCompany("Microsoft")]
22-
[assembly: AssemblyProduct("Microsoft Azure Powershell")]
23-
[assembly: AssemblyCopyright("Copyright © Microsoft")]
20+
[assembly: AssemblyTitle("Microsoft Azure Powershell - Compute Resource Provider")]
21+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
22+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
23+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
2424

2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("91792853-487B-4DC2-BE6C-DD09A0A1BC10")]
28-
[assembly: AssemblyVersion("0.8.4")]
29-
[assembly: AssemblyFileVersion("0.8.4")]
28+
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
29+
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Compute.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.21-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.1-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Compute" version="3.4.0-preview" targetFramework="net45" />
1011
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1112
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1213
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.NetworkResourceProvider.Test/Commands.NetworkResourceProvider.Test.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
<Reference Include="Microsoft.Azure.Common">
4949
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
51+
<Reference Include="Microsoft.Azure.Common.Authentication">
52+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5453
</Reference>
5554
<Reference Include="Microsoft.Azure.Common.NetFramework">
5655
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -63,7 +62,7 @@
6362
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6463
</Reference>
6564
<Reference Include="Microsoft.Azure.Management.Authorization">
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6766
</Reference>
6867
<Reference Include="Microsoft.Azure.ResourceManager">
6968
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -107,10 +106,7 @@
107106
</Reference>
108107
<Reference Include="System" />
109108
<Reference Include="System.Core" />
110-
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111-
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
113-
</Reference>
109+
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
114110
<Reference Include="System.Net" />
115111
<Reference Include="System.Net.Http" />
116112
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ResourceManager/Network/Commands.NetworkResourceProvider.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.21-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.1-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Commands.NetworkResourceProvider.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<Reference Include="Microsoft.Azure.Common">
5555
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Microsoft.Azure.Common.Authentication">
57+
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Common.NetFramework">
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -69,8 +69,7 @@
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.Management.Authorization">
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
73-
<Private>True</Private>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7473
</Reference>
7574
<Reference Include="Microsoft.Azure.Management.Network">
7675
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Network.dll</HintPath>

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<package id="AutoMapper" version="3.1.1" targetFramework="net45" />
44
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.21-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1313
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ServiceManagement/StorSimple/Commands.StorSimple.Test/ScenarioTests/BackupPolicyTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ namespace Microsoft.WindowsAzure.Commands.StorSimple.Test.ScenarioTests
2020
public class BackupPolicyTests:StorSimpleTestBase
2121
{
2222
#region New-AzureStorSimpleDeviceBackupScheduleAddConfig
23-
[Fact(Skip = "Skip for CRP2.")]
23+
[Fact]
2424
[Trait("StorSimpleCmdlets", "New-BackupPolicyConfig")]
2525
[Trait(Category.AcceptanceType, Category.CheckIn)]
2626
public void TestNewBackupPolicyConfig()
2727
{
2828
RunPowerShellTest("Test-NewBackupPolicyAddConfig");
2929
}
3030

31-
[Fact(Skip = "Skip for CRP2.")]
31+
[Fact]
3232
[Trait("StorSimpleCmdlets", "New-BackupPolicyConfig")]
3333
[Trait(Category.AcceptanceType, Category.CheckIn)]
3434
public void TestNewBackupPolicyAddConfigDefaultValues()

‎src/lib/Microsoft.Azure.Management.Compute.dll

-202 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.Compute.3.4.0-preview.nupkg

173 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.Network.1.0.8-preview.nupkg

211 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.Storage.2.1.0-preview.nupkg

75.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)