Skip to content

Commit 90db7d0

Browse files
huangpfhuangpf
committed
Address CRs
1 parent 7f7e76b commit 90db7d0

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
<Reference Include="Microsoft.Azure.Management.Authorization">
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6767
</Reference>
68+
<Reference Include="Microsoft.Azure.Management.Compute">
69+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
70+
</Reference>
6871
<Reference Include="Microsoft.Azure.ResourceManager">
6972
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7073
</Reference>
@@ -94,10 +97,6 @@
9497
<SpecificVersion>False</SpecificVersion>
9598
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
9699
</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>
101100
<Reference Include="Microsoft.Azure.Management.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102101
<SpecificVersion>False</SpecificVersion>
103102
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Network.dll</HintPath>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
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" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Compute" version="3.4.0-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="1.0.8-preview" targetFramework="net45" />
1012
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
13+
<package id="Microsoft.Azure.Management.Storage" version="2.1.0-preview" targetFramework="net45" />
1114
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1215
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1316
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75+
<Reference Include="Microsoft.Azure.Management.Compute">
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
77+
</Reference>
7578
<Reference Include="Microsoft.Azure.ResourceManager">
7679
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7780
</Reference>
@@ -119,9 +122,6 @@
119122
<Reference Include="System.Data" />
120123
<Reference Include="System.Xml" />
121124
<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>
125125
<Reference Include="Microsoft.Azure.Management.Storage">
126126
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Storage.dll</HintPath>
127127
</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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
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" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-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/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)