Skip to content

Commit 092d031

Browse files
Taking care of Code Review.
1 parent 61b5744 commit 092d031

File tree

12 files changed

+43
-58
lines changed

12 files changed

+43
-58
lines changed

AzurePowershell.Test.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TestSettings_x64>.\src\Local.x64.testsettings</TestSettings_x64>
88
<ScenarioTestDebug>.\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
99
<CommonTestDebug>.\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
10-
<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
10+
<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
1111
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
1212
<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
1313
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
@@ -65,7 +65,7 @@
6565
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
6666
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
6767
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
68-
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
68+
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
6969
</ItemGroup>
7070

7171
<Target Name="InvokeMSTest">

ChangeLog.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
2015.07.16 version 0.9.5
1+
2015.07.10 version 1.0.0
2+
* Azure Backup cmdlets
3+
*Added New-AzureBackupVault cmdlets
4+
*Added Get-AzureBackupVault cmdlets
5+
*Added Set-AzureBackupVault cmdlets
6+
*Added Remove-AzureBackupVault cmdlets
7+
*Added Get-AzureBackupVaultCredential cmdlets
8+
9+
2015.07.16 version 0.9.5
210
* Azure Resource Manager cmdlets
311
* Fixed formatting of output for Get-UsageAggregates
412
* Fixed executing Get-UsageAggregates when first cmdlet being called.

src/ResourceManager.AzureBackup.sln

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
1-
using System.Reflection;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
using System.Reflection;
215
using System.Runtime.CompilerServices;
316
using System.Runtime.InteropServices;
417

518
// General Information about an assembly is controlled through the following
619
// set of attributes. Change these attribute values to modify the information
720
// associated with an assembly.
8-
[assembly: AssemblyTitle("Commands.AzureBackup.Test")]
21+
[assembly: AssemblyTitle("Microsoft.Azure.Commands.AzureBackup.Test")]
922
[assembly: AssemblyDescription("")]
1023
[assembly: AssemblyConfiguration("")]
1124
[assembly: AssemblyCompany("")]
@@ -32,5 +45,5 @@
3245
// You can specify all the values or you can default the Build and Revision Numbers
3346
// by using the '*' as shown below:
3447
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
48+
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
49+
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/GetAzureBackupVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2424
{
2525
/// <summary>
26-
/// API to get azure backup vaults in a subscription
26+
/// Command to get azure backup vaults in a subscription
2727
/// </summary>
2828
[Cmdlet(VerbsCommon.Get, "AzureBackupVault"), OutputType(typeof(AzurePSBackupVault), typeof(List<AzurePSBackupVault>))]
2929
public class GetAzureBackupVault : AzureBackupCmdletBase

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/NewAzureBackupVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2121
{
2222
/// <summary>
23-
/// API to create an azure backup vault in a subscription
23+
/// Command to create an azure backup vault in a subscription
2424
/// </summary>
2525
[Cmdlet(VerbsCommon.New, "AzureBackupVault"), OutputType(typeof(AzurePSBackupVault))]
2626
public class NewAzureBackupVault : AzureBackupCmdletBase

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureBackupVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
1818
{
1919
/// <summary>
20-
/// API to remove an azure backup vault in the subscription
20+
/// Command to remove an azure backup vault in the subscription
2121
/// </summary>
2222
[Cmdlet(VerbsCommon.Remove, "AzureBackupVault")]
2323
public class RemoveAzureBackupVault : AzureBackupVaultCmdletBase

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/SetAzureBackupVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2222
{
2323
/// <summary>
24-
/// API to update an azure backup vault in a subscription.
24+
/// Command to update an azure backup vault in a subscription.
2525
/// </summary>
2626
[Cmdlet(VerbsCommon.Set, "AzureBackupVault"), OutputType(typeof(CmdletModel.AzurePSBackupVault))]
2727
public class SetAzureBackupVault : AzureBackupVaultCmdletBase

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/VaultCredentials/GetAzureBackupVaultCredentials.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2828
{
2929
/// <summary>
30-
/// API to download an azure backup vault's credentials.
30+
/// Command to download an azure backup vault's credentials.
3131
/// </summary>
3232
[Cmdlet(VerbsCommon.Get, "AzureBackupVaultCredentials"), OutputType(typeof(string))]
3333
public class GetAzureBackupVaultCredentials : AzureBackupVaultCmdletBase

src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -169,25 +169,11 @@
169169
<Name>Commands.Common</Name>
170170
</ProjectReference>
171171
</ItemGroup>
172-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
174-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
175-
<PropertyGroup>
176-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
177-
</PropertyGroup>
178-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
179-
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
180-
</Target>
181-
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
182-
<PropertyGroup>
183-
<PostBuildEvent>
184-
</PostBuildEvent>
185-
</PropertyGroup>
186-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
187-
Other similar extension points exist, see Microsoft.Common.targets.
188-
<Target Name="BeforeBuild">
189-
</Target>
190-
<Target Name="AfterBuild">
191-
</Target>
192-
-->
172+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
174+
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
175+
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
176+
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
177+
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
178+
</Target>
193179
</Project>

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace Microsoft.Azure.Commands.AzureBackup.Helpers
2020
{
21-
public static class VaultHelpers
21+
internal static class VaultHelpers
2222
{
2323
/// <summary>
2424
/// Gets CmdletModel of backup vault from Client model

src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
11-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
11+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1212
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1313
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management.Scheduler" version="6.0.0" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management.StorSimple" version="1.0.4-preview" targetFramework="net45" />
17-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
17+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1818
</packages>

0 commit comments

Comments
 (0)