Skip to content

Commit 43677a5

Browse files
author
Hovsep Mkrtchyan
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
2 parents 9f3c4fd + 5c76be7 commit 43677a5

File tree

147 files changed

+390
-1302
lines changed

Some content is hidden

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

147 files changed

+390
-1302
lines changed

‎build.proj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@
3939
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' != '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<CmdletSolutionsToBuild Include=".\src\ResourceManager.sln;.\src\ServiceManagement.sln" Condition=" '$(Scope)' == '' "/>
43-
<CmdletSolutionsToBuild Include=".\src\$(Scope).sln" Condition=" '$(Scope)' != '' "/>
42+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == '' "/>
43+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln" Condition=" '$(Scope)' != '' and '$(Scope)' != 'ServiceManagement' "/>
44+
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' != '' and '$(Scope)' == 'ServiceManagement' "/>
4445
<SetupSln Include=".\setup\azurepowershell.sln" />
4546
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
4647
</ItemGroup>
@@ -104,7 +105,7 @@
104105
</Target>
105106

106107
<PropertyGroup>
107-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
108+
<NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
108109
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
109110
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
110111
<PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
@@ -131,13 +132,9 @@
131132
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
132133

133134
<!-- Restore packages -->
134-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ResourceManager.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
135-
Condition="$(Scope) == ''" />
136-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ServiceManagement.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
137-
Condition="$(Scope) == ''" />
138-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\$(Scope).sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
139-
Condition="$(Scope) != ''" />
140-
135+
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)"
136+
ContinueOnError="false" />
137+
141138
<!--Restore the xunit runner needed to run unit tests-->
142139
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
143140

‎src/.nuget/NuGet.Config

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

‎src/.nuget/NuGet.targets

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

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<RestorePackages>true</RestorePackages>
1716
<CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
1817
</PropertyGroup>
@@ -182,6 +181,5 @@
182181
<None Include="packages.config" />
183182
</ItemGroup>
184183
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
185-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
186184
<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')" />
187185
</Project>

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1615
<RestorePackages>true</RestorePackages>
1716
<CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
1817
<NuGetPackageImportStamp>06e19c11</NuGetPackageImportStamp>
@@ -182,6 +181,5 @@
182181
</ItemGroup>
183182
<ItemGroup />
184183
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
185-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
186184
<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')" />
187185
</Project>

‎src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -165,24 +165,5 @@
165165
</ProjectReference>
166166
</ItemGroup>
167167
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
168-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
169-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
170-
<PropertyGroup>
171-
<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>
172-
</PropertyGroup>
173-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
174-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
175-
</Target>
176168
<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')" />
177-
<PropertyGroup>
178-
<PostBuildEvent>
179-
</PostBuildEvent>
180-
</PropertyGroup>
181-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
182-
Other similar extension points exist, see Microsoft.Common.targets.
183-
<Target Name="BeforeBuild">
184-
</Target>
185-
<Target Name="AfterBuild">
186-
</Target>
187-
-->
188169
</Project>

‎src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,4 @@
6161
</ProjectReference>
6262
</ItemGroup>
6363
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
65-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
66-
<PropertyGroup>
67-
<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>
68-
</PropertyGroup>
69-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
70-
</Target>
71-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
72-
Other similar extension points exist, see Microsoft.Common.targets.
73-
<Target Name="BeforeBuild">
74-
</Target>
75-
<Target Name="AfterBuild">
76-
</Target>
77-
-->
7864
</Project>

‎src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,4 @@
7070
<None Include="MSSharedLibKey.snk" />
7171
</ItemGroup>
7272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
74-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
75-
<PropertyGroup>
76-
<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>
77-
</PropertyGroup>
78-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
79-
</Target>
80-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
81-
Other similar extension points exist, see Microsoft.Common.targets.
82-
<Target Name="BeforeBuild">
83-
</Target>
84-
<Target Name="AfterBuild">
85-
</Target>
86-
-->
8773
</Project>

‎src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,19 +239,5 @@
239239
</Choose>
240240
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
241241
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
242-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
243242
<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')" />
244-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
245-
<PropertyGroup>
246-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
247-
</PropertyGroup>
248-
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
249-
</Target>
250-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
251-
Other similar extension points exist, see Microsoft.Common.targets.
252-
<Target Name="BeforeBuild">
253-
</Target>
254-
<Target Name="AfterBuild">
255-
</Target>
256-
-->
257243
</Project>

‎src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,4 @@
9999
<None Include="packages.config" />
100100
</ItemGroup>
101101
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
102-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
103-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
104-
<PropertyGroup>
105-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
106-
</PropertyGroup>
107-
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
108-
</Target>
109-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
110-
Other similar extension points exist, see Microsoft.Common.targets.
111-
<Target Name="BeforeBuild">
112-
</Target>
113-
<Target Name="AfterBuild">
114-
</Target>
115-
-->
116102
</Project>

0 commit comments

Comments
 (0)