Skip to content

Commit 6a50d36

Browse files
Matt-WestphalMatt-Westphal
committed
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
1 parent 9399269 commit 6a50d36

File tree

514 files changed

+87957
-53106
lines changed

Some content is hidden

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

514 files changed

+87957
-53106
lines changed

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

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{678AE95D-2364-47D7-888C-3FFA6D412CC8}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>Microsoft.Azure.Commands.AzureBackup.Test</RootNamespace>
12+
<AssemblyName>Microsoft.Azure.Commands.AzureBackup.Test</AssemblyName>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
17+
<NuGetPackageImportStamp>0043d215</NuGetPackageImportStamp>
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>bin\Release\</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
</PropertyGroup>
37+
<ItemGroup>
38+
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
40+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
41+
</Reference>
42+
<Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<SpecificVersion>False</SpecificVersion>
44+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.0-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
45+
</Reference>
46+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
</Reference>
52+
<Reference Include="Hyak.Common">
53+
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Microsoft.Azure.Common">
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Microsoft.Azure.Common.NetFramework">
59+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Microsoft.Azure.Test.Framework">
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
74+
</Reference>
75+
<Reference Include="Microsoft.Threading.Tasks">
76+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
77+
</Reference>
78+
<Reference Include="Microsoft.Threading.Tasks.Extensions">
79+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
80+
</Reference>
81+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
82+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
83+
</Reference>
84+
<Reference Include="Microsoft.WindowsAzure.Management">
85+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
86+
</Reference>
87+
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<SpecificVersion>False</SpecificVersion>
89+
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
90+
</Reference>
91+
<Reference Include="Newtonsoft.Json">
92+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
93+
</Reference>
94+
<Reference Include="System" />
95+
<Reference Include="System.Configuration" />
96+
<Reference Include="System.Core" />
97+
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<SpecificVersion>False</SpecificVersion>
99+
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
100+
</Reference>
101+
<Reference Include="System.Net" />
102+
<Reference Include="System.Net.Http" />
103+
<Reference Include="System.Net.Http.Extensions">
104+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
105+
<Private>True</Private>
106+
</Reference>
107+
<Reference Include="System.Net.Http.Primitives">
108+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
109+
<Private>True</Private>
110+
</Reference>
111+
<Reference Include="System.Net.Http.WebRequest" />
112+
<Reference Include="System.Runtime.Serialization" />
113+
<Reference Include="System.Xml.Linq" />
114+
<Reference Include="System.Data.DataSetExtensions" />
115+
<Reference Include="Microsoft.CSharp" />
116+
<Reference Include="System.Data" />
117+
<Reference Include="System.Xml" />
118+
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
119+
<SpecificVersion>False</SpecificVersion>
120+
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
121+
</Reference>
122+
<Reference Include="xunit.extensions">
123+
<HintPath>..\..\..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
124+
</Reference>
125+
</ItemGroup>
126+
<ItemGroup>
127+
<Compile Include="ScenarioTests\AzureBackupTestBase.cs" />
128+
<Compile Include="Properties\AssemblyInfo.cs" />
129+
<Compile Include="ScenarioTests\AzureBackupVaultTests.cs">
130+
<SubType>Code</SubType>
131+
</Compile>
132+
</ItemGroup>
133+
<ItemGroup>
134+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
135+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
136+
<Name>Commands.Common</Name>
137+
</ProjectReference>
138+
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
139+
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
140+
<Name>Commands.ScenarioTests.Common</Name>
141+
</ProjectReference>
142+
<ProjectReference Include="..\Commands.AzureBackup\Commands.AzureBackup.csproj">
143+
<Project>{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}</Project>
144+
<Name>Commands.AzureBackup</Name>
145+
</ProjectReference>
146+
</ItemGroup>
147+
<ItemGroup>
148+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
149+
</ItemGroup>
150+
<ItemGroup>
151+
<None Include="App.config">
152+
<SubType>Designer</SubType>
153+
</None>
154+
<None Include="packages.config">
155+
<SubType>Designer</SubType>
156+
</None>
157+
<None Include="ScenarioTests\AzureBackupVaultTests.ps1">
158+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
159+
</None>
160+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests\AzureBackupVaultScenarioTests.json">
161+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
162+
</None>
163+
</ItemGroup>
164+
<ItemGroup />
165+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
166+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
167+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
168+
<PropertyGroup>
169+
<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>
170+
</PropertyGroup>
171+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
172+
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
173+
</Target>
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>
179+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
180+
Other similar extension points exist, see Microsoft.Common.targets.
181+
<Target Name="BeforeBuild">
182+
</Target>
183+
<Target Name="AfterBuild">
184+
</Target>
185+
-->
186+
</Project>

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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;
15+
using System.Runtime.CompilerServices;
16+
using System.Runtime.InteropServices;
17+
18+
// General Information about an assembly is controlled through the following
19+
// set of attributes. Change these attribute values to modify the information
20+
// associated with an assembly.
21+
[assembly: AssemblyTitle("Microsoft.Azure.Commands.AzureBackup.Test")]
22+
[assembly: AssemblyDescription("")]
23+
[assembly: AssemblyConfiguration("")]
24+
[assembly: AssemblyCompany("")]
25+
[assembly: AssemblyProduct("Commands.AzureBackup.Test")]
26+
[assembly: AssemblyCopyright("Copyright © 2015")]
27+
[assembly: AssemblyTrademark("")]
28+
[assembly: AssemblyCulture("")]
29+
30+
// Setting ComVisible to false makes the types in this assembly not visible
31+
// to COM components. If you need to access a type in this assembly from
32+
// COM, set the ComVisible attribute to true on that type.
33+
[assembly: ComVisible(false)]
34+
35+
// The following GUID is for the ID of the typelib if this project is exposed to COM
36+
[assembly: Guid("49823b4f-deb2-4cf5-a8e7-5118fc6a05d6")]
37+
38+
// Version information for an assembly consists of the following four values:
39+
//
40+
// Major Version
41+
// Minor Version
42+
// Build Number
43+
// Revision
44+
//
45+
// You can specify all the values or you can default the Build and Revision Numbers
46+
// by using the '*' as shown below:
47+
// [assembly: AssemblyVersion("1.0.*")]
48+
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
49+
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]

0 commit comments

Comments
 (0)