Skip to content

Commit 7e37827

Browse files
sudhakar4171sudhakar4171
committed
merge commit
2 parents 9388b7d + e68ceaa commit 7e37827

File tree

17 files changed

+197
-69
lines changed

17 files changed

+197
-69
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AssemblyName>Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -60,6 +62,10 @@
6062
<Compile Include="Properties\AssemblyInfo.cs" />
6163
</ItemGroup>
6264
<ItemGroup>
65+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
66+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
67+
<Name>Commands.Common</Name>
68+
</ProjectReference>
6369
<ProjectReference Include="..\Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.csproj">
6470
<Project>{5e675749-6139-464a-904c-59c0ffdfec82}</Project>
6571
<Name>Commands.RecoveryServices.Backup.Logger</Name>
@@ -73,6 +79,13 @@
7379
<None Include="packages.config" />
7480
</ItemGroup>
7581
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
83+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
84+
<PropertyGroup>
85+
<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>
86+
</PropertyGroup>
87+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
88+
</Target>
7689
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7790
Other similar extension points exist, see Microsoft.Common.targets.
7891
<Target Name="BeforeBuild">

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,24 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using System.Reflection;
1617
using System.Runtime.CompilerServices;
1718
using System.Runtime.InteropServices;
1819

1920
// General Information about an assembly is controlled through the following
2021
// set of attributes. Change these attribute values to modify the information
2122
// associated with an assembly.
22-
[assembly: AssemblyTitle("Helpers")]
23-
[assembly: AssemblyDescription("")]
24-
[assembly: AssemblyConfiguration("")]
25-
[assembly: AssemblyCompany("")]
26-
[assembly: AssemblyProduct("Helpers")]
27-
[assembly: AssemblyCopyright("Copyright © 2016")]
28-
[assembly: AssemblyTrademark("")]
29-
[assembly: AssemblyCulture("")]
23+
[assembly: AssemblyTitle("Microsoft Azure Powershell")]
24+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
25+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
26+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
3027

3128
// Setting ComVisible to false makes the types in this assembly not visible
3229
// to COM components. If you need to access a type in this assembly from
3330
// COM, set the ComVisible attribute to true on that type.
3431
[assembly: ComVisible(false)]
35-
36-
// The following GUID is for the ID of the typelib if this project is exposed to COM
37-
[assembly: Guid("80e5eb92-c776-4e6a-af93-712e23965e2a")]
32+
[assembly: CLSCompliant(false)]
3833

3934
// Version information for an assembly consists of the following four values:
4035
//

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AssemblyName>Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -76,6 +78,10 @@
7678
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
7779
<Name>Commands.Common.Authentication</Name>
7880
</ProjectReference>
81+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
82+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
83+
<Name>Commands.Common</Name>
84+
</ProjectReference>
7985
<ProjectReference Include="..\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.csproj">
8086
<Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
8187
<Name>Commands.RecoveryServices.Backup.Models</Name>
@@ -89,6 +95,13 @@
8995
<None Include="packages.config" />
9096
</ItemGroup>
9197
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
98+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
99+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
100+
<PropertyGroup>
101+
<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>
102+
</PropertyGroup>
103+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
104+
</Target>
92105
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
93106
Other similar extension points exist, see Microsoft.Common.targets.
94107
<Target Name="BeforeBuild">

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,24 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using System.Reflection;
1617
using System.Runtime.CompilerServices;
1718
using System.Runtime.InteropServices;
1819

1920
// General Information about an assembly is controlled through the following
2021
// set of attributes. Change these attribute values to modify the information
2122
// associated with an assembly.
22-
[assembly: AssemblyTitle("Adapter")]
23-
[assembly: AssemblyDescription("")]
24-
[assembly: AssemblyConfiguration("")]
25-
[assembly: AssemblyCompany("")]
26-
[assembly: AssemblyProduct("Adapter")]
27-
[assembly: AssemblyCopyright("Copyright © 2016")]
28-
[assembly: AssemblyTrademark("")]
29-
[assembly: AssemblyCulture("")]
23+
[assembly: AssemblyTitle("Microsoft Azure Powershell")]
24+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
25+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
26+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
3027

3128
// Setting ComVisible to false makes the types in this assembly not visible
3229
// to COM components. If you need to access a type in this assembly from
3330
// COM, set the ComVisible attribute to true on that type.
3431
[assembly: ComVisible(false)]
35-
36-
// The following GUID is for the ID of the typelib if this project is exposed to COM
37-
[assembly: Guid("ad1e4b97-f782-4fd0-b2bf-14472c362306")]
32+
[assembly: CLSCompliant(false)]
3833

3934
// Version information for an assembly consists of the following four values:
4035
//

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/Commands.RecoveryServices.Backup.Logger.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<Compile Include="Logger.cs" />
4343
<Compile Include="Properties\AssemblyInfo.cs" />
4444
</ItemGroup>
45+
<ItemGroup>
46+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
47+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
48+
<Name>Commands.Common</Name>
49+
</ProjectReference>
50+
</ItemGroup>
4551
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4652
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
4753
Other similar extension points exist, see Microsoft.Common.targets.

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,24 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using System.Reflection;
1617
using System.Runtime.CompilerServices;
1718
using System.Runtime.InteropServices;
1819

1920
// General Information about an assembly is controlled through the following
2021
// set of attributes. Change these attribute values to modify the information
2122
// associated with an assembly.
22-
[assembly: AssemblyTitle("Commands.RecoveryServices.Backup.Logger")]
23-
[assembly: AssemblyDescription("")]
24-
[assembly: AssemblyConfiguration("")]
25-
[assembly: AssemblyCompany("")]
26-
[assembly: AssemblyProduct("Commands.RecoveryServices.Backup.Logger")]
27-
[assembly: AssemblyCopyright("Copyright © 2016")]
28-
[assembly: AssemblyTrademark("")]
29-
[assembly: AssemblyCulture("")]
23+
[assembly: AssemblyTitle("Microsoft Azure Powershell")]
24+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
25+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
26+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
3027

3128
// Setting ComVisible to false makes the types in this assembly not visible
3229
// to COM components. If you need to access a type in this assembly from
3330
// COM, set the ComVisible attribute to true on that type.
3431
[assembly: ComVisible(false)]
35-
36-
// The following GUID is for the ID of the typelib if this project is exposed to COM
37-
[assembly: Guid("cac38a0e-a5a2-4473-b2a9-e6f6f49ca63d")]
32+
[assembly: CLSCompliant(false)]
3833

3934
// Version information for an assembly consists of the following four values:
4035
//

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@
6868
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
6969
</EmbeddedResource>
7070
</ItemGroup>
71-
<ItemGroup />
71+
<ItemGroup>
72+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
73+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
74+
<Name>Commands.Common</Name>
75+
</ProjectReference>
76+
</ItemGroup>
7277
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7378
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7479
Other similar extension points exist, see Microsoft.Common.targets.

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,24 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using System.Reflection;
1617
using System.Runtime.CompilerServices;
1718
using System.Runtime.InteropServices;
1819

1920
// General Information about an assembly is controlled through the following
2021
// set of attributes. Change these attribute values to modify the information
2122
// associated with an assembly.
22-
[assembly: AssemblyTitle("Models")]
23-
[assembly: AssemblyDescription("")]
24-
[assembly: AssemblyConfiguration("")]
25-
[assembly: AssemblyCompany("")]
26-
[assembly: AssemblyProduct("Models")]
27-
[assembly: AssemblyCopyright("Copyright © 2016")]
28-
[assembly: AssemblyTrademark("")]
29-
[assembly: AssemblyCulture("")]
23+
[assembly: AssemblyTitle("Microsoft Azure Powershell")]
24+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
25+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
26+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
3027

3128
// Setting ComVisible to false makes the types in this assembly not visible
3229
// to COM components. If you need to access a type in this assembly from
3330
// COM, set the ComVisible attribute to true on that type.
3431
[assembly: ComVisible(false)]
35-
36-
// The following GUID is for the ID of the typelib if this project is exposed to COM
37-
[assembly: Guid("c26540c5-042f-4727-ad18-56342944e821")]
32+
[assembly: CLSCompliant(false)]
3833

3934
// Version information for an assembly consists of the following four values:
4035
//

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
<Compile Include="Providers\IaasVmPsBackupProvider.cs" />
6565
</ItemGroup>
6666
<ItemGroup>
67+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
68+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
69+
<Name>Commands.Common</Name>
70+
</ProjectReference>
6771
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
6872
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
6973
<Name>Commands.ResourceManager.Common</Name>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,24 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using System.Reflection;
1617
using System.Runtime.CompilerServices;
1718
using System.Runtime.InteropServices;
1819

1920
// General Information about an assembly is controlled through the following
2021
// set of attributes. Change these attribute values to modify the information
2122
// associated with an assembly.
22-
[assembly: AssemblyTitle("ProviderModel")]
23-
[assembly: AssemblyDescription("")]
24-
[assembly: AssemblyConfiguration("")]
25-
[assembly: AssemblyCompany("")]
26-
[assembly: AssemblyProduct("ProviderModel")]
27-
[assembly: AssemblyCopyright("Copyright © 2016")]
28-
[assembly: AssemblyTrademark("")]
29-
[assembly: AssemblyCulture("")]
23+
[assembly: AssemblyTitle("Microsoft Azure Powershell")]
24+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
25+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
26+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
3027

3128
// Setting ComVisible to false makes the types in this assembly not visible
3229
// to COM components. If you need to access a type in this assembly from
3330
// COM, set the ComVisible attribute to true on that type.
3431
[assembly: ComVisible(false)]
35-
36-
// The following GUID is for the ID of the typelib if this project is exposed to COM
37-
[assembly: Guid("a6263682-6dc1-43e6-858b-9128281b5e69")]
32+
[assembly: CLSCompliant(false)]
3833

3934
// Version information for an assembly consists of the following four values:
4035
//

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create
7474
throw new NotImplementedException();
7575
}
7676

77-
public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
77+
public ProtectionPolicyResponse ModifyPolicy()
7878
{
7979
throw new NotImplementedException();
8080
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create
7575
throw new NotImplementedException();
7676
}
7777

78-
public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
78+
public ProtectionPolicyResponse ModifyPolicy()
7979
{
8080
throw new NotImplementedException();
8181
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1617
using System;
1718
using System.Collections.Generic;
1819
using System.Linq;
@@ -25,6 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2526
public partial class ContainerTests : RecoveryServicesBackupTestsBase
2627
{
2728
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetContainerScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetContainerScenario");

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1617
using System;
1718
using System.Collections.Generic;
1819
using System.Linq;
@@ -25,6 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2526
public partial class ItemTests : RecoveryServicesBackupTestsBase
2627
{
2728
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetItemScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetItemScenario");

0 commit comments

Comments
 (0)