Skip to content

Commit 139db6c

Browse files
sriramvusriramvu
committed
Merge remote-tracking branch 'upstream/dev' into dev
Conflicts: setup/azurecmdfiles.wxi src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.cs src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/packages.config src/ServiceManagement/Services/Commands.Utilities/Azure.psd1
2 parents 64f6564 + 8bc1d0e commit 139db6c

File tree

2,161 files changed

+565490
-75479
lines changed

Some content is hidden

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

2,161 files changed

+565490
-75479
lines changed

‎AzurePowershell.Test.targets

Lines changed: 94 additions & 35 deletions
Large diffs are not rendered by default.

‎ChangeLog.txt

Lines changed: 280 additions & 23 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 209 additions & 45 deletions
Large diffs are not rendered by default.

‎build.proj

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<UsingTask
28-
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runners.2.0.0-beta4-build2738\tools\xunit.runner.msbuild.dll"
28+
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.runner.msbuild.dll"
2929
TaskName="Xunit.Runner.MSBuild.xunit" />
3030

3131
<!-- Clean the build in all configurations -->
@@ -88,14 +88,25 @@
8888
<NuGetCache Include="$(LOCALAPPDATA)\NuGet\Cache\*.nupkg"/>
8989
</ItemGroup>
9090

91-
<!-- Delete NuGet cache-->
91+
<!-- Delete NuGet cache-->
9292
<Delete Files="@(NuGetCache)" />
93+
94+
<Delete Files="$(NuGetRestoreConfigFile)" />
95+
<WriteLinesToFile
96+
File="$(NuGetRestoreConfigFile)"
97+
Lines="&lt;configuration&gt;&lt;/configuration&gt;"
98+
Overwrite="true"
99+
Encoding="Unicode"/>
100+
101+
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
93102

94103
<!-- Restore packages -->
95-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln" ContinueOnError="false" />
104+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
96105

97106
<!--Restore the xunit runner needed to run unit tests-->
98107
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
108+
109+
<Delete Files="$(NuGetRestoreConfigFile)" />
99110
</Target>
100111

101112
<!-- Build all flavors of the Cmdlets -->
@@ -154,7 +165,7 @@
154165
<!-- Do everything possible -->
155166
<Target
156167
Name="Full"
157-
DependsOnTargets="ForceRestorePackages;Clean;BuildDebug;BuildRelease;Test;BuildSetupDebug;BuildSetupRelease" />
168+
DependsOnTargets="ForceRestorePackages;Clean;BuildDebug;Test;BuildSetupDebug" />
158169

159170
<!-- Build the Cmdlets in Release configuration -->
160171
<Target Name="BuildRelease" DependsOnTargets="ForceRestorePackages">
@@ -180,15 +191,15 @@
180191

181192
<PropertyGroup>
182193
<RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
183-
<XUnitExcludedTrait Condition="!$(RunTestLive)">RunType=LiveOnly</XUnitExcludedTrait>
194+
<XUnitIncludedTrait Condition="!$(RunTestLive)">AcceptanceType=CheckIn</XUnitIncludedTrait>
184195
</PropertyGroup>
185196
<!-- Note: all testing related target should go to 'AzurePowershell.test.targets' file except the one used by CI run -->
186197
<Import Project="$(MSBuildThisFileDirectory)AzurePowershell.test.targets"/>
187198

188199
<!-- Run checkin tests for each pull request -->
189200
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
190201
<Message Importance="high" Text="Running check in tests..." />
191-
<CallTarget Targets="InvokeXUnit; TestHDInsight; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestDSCExtension_x64"/>
202+
<CallTarget Targets="InvokeXUnit"/>
192203
</Target>
193204

194205
<!-- Run Full switch with scenario tests -->

‎packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit.runners" version="2.0.0-beta4-build2738" />
3+
<package id="xunit.runner.console" version="2.0.0" />
44
<package id="xunit.runners" version="1.9.2" />
55
</packages>

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - March 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - June 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.16" ?>
8+
<?define version="0.9.3" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

Lines changed: 2034 additions & 448 deletions
Large diffs are not rendered by default.

‎setup/azurepowershell.sln

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30110.0
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
66
ProjectSection(ProjectDependencies) = postProject
@@ -15,10 +15,8 @@ Global
1515
Release|Any CPU = Release|Any CPU
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
18+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
2220
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2321
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2422
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/.nuget/NuGet.Config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6+
<activePackageSource>
7+
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
8+
<add key="internal share" value="\\aaptfile01\adxsdk\nuget\binaries\packages" />
9+
</activePackageSource>
610
</configuration>

0 commit comments

Comments
 (0)