Skip to content

Commit b29886a

Browse files
author
Hao Chen
committed
Merge branch 'clu' of github.com:Azure/azure-powershell into hovsep-clu
2 parents 13400ca + 3328b11 commit b29886a

File tree

123 files changed

+4577
-560
lines changed

Some content is hidden

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

123 files changed

+4577
-560
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ app.config
2121
*.sln.docstates
2222
*.lock.json
2323
.vs/
24+
artifacts/
2425

2526
# Build results
2627
[Dd]ebug/

CLUPackages/Microsoft.CLU.0.0.1.nupkg

-286 KB
Binary file not shown.

build.proj

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
3434
<PublishDirectory>$(LibrarySourceFolder)\Publish</PublishDirectory>
3535
<PackageDirectory>$(LibrarySourceFolder)\Package</PackageDirectory>
36+
<CLURootDir>$(LibrarySourceFolder)\CLU</CLURootDir>
3637
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
3738
<CodeSign Condition=" '$(CodeSign)' == '' ">false</CodeSign>
3839
<!--Set this true only if you want to test the code sign workflow locally-->
@@ -142,8 +143,19 @@
142143
</Target>
143144

144145
<!-- Build all flavors of the Cmdlets -->
145-
<Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask">
146-
<Message Importance="high" Text="Building Cmdlets..." />
146+
<!-- TODO: once CLU stablizes, see whether we need : DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask" -->
147+
<Target Name="Build">
148+
<PropertyGroup>
149+
<_TemporaryDnxFeeds>-s https://api.nuget.org/v3/index.json -s $(LibraryToolsFolder)\LocalFeed</_TemporaryDnxFeeds>
150+
</PropertyGroup>
151+
<Exec Command="dnu restore $(_TemporaryDnxFeeds)" WorkingDirectory="$(CLURootDir)"/>
152+
<ItemGroup>
153+
<_CLUProjects Include="$(CLURootDir)\**\project.json"
154+
Exclude="$(CLURootDir)\*.Test\project.json"></_CLUProjects>
155+
</ItemGroup>
156+
<Exec Command="dnu build" WorkingDirectory="%(_CLUProjects.RootDir)%(_CLUProjects.Directory)" />
157+
158+
<!--<Message Importance="high" Text="Building Cmdlets..." />
147159
<MSBuild
148160
Projects="@(CmdletSolutionsToBuild)"
149161
Targets="Build"
@@ -153,7 +165,7 @@
153165
154166
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
155167
156-
<Message Importance="high" Text="Building Setup..." />
168+
<Message Importance="high" Text="Building Setup..." />-->
157169

158170
<!--<MSBuild
159171
Projects="@(SetupSln)"
@@ -166,11 +178,12 @@
166178
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" /> -->
167179
</Target>
168180

169-
<!-- Do everything possible -->
181+
<!--TODO: once CLU stablizes, see whether we need invoke 'clean' target.
182+
Dnx uses dynamic compilation, 'clean' is unnecessary -->
170183
<Target
171184
Name="Full"
172-
DependsOnTargets="Clean;Build;Test" />
173-
185+
DependsOnTargets="Build;Test" />
186+
174187
<Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">
175188
<MSBuild Projects="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.csproj"
176189
Targets="Build" Properties="Configuration=Debug;Platform=AnyCPU" />
@@ -298,7 +311,15 @@
298311
<!-- Run checkin tests for each pull request -->
299312
<Target Name="Test" DependsOnTargets="BeforeRunTests">
300313
<Message Importance="high" Text="Running check in tests..." />
301-
<CallTarget Targets="InvokeXUnit"/>
314+
<ItemGroup>
315+
<!--Exclude 1 test projects still in progress with build failures-->
316+
<_CLUTestProjects Include="$(CLURootDir)\*.Test\project.json"
317+
Exclude="$(CLURootDir)\Microsoft.Azure.Commands.Resources.Test\project.json">
318+
</_CLUTestProjects>
319+
</ItemGroup>
320+
<Exec Command="dnu build" WorkingDirectory="%(_CLUTestProjects.RootDir)%(_CLUTestProjects.Directory)" />
321+
<Exec Command="dnx test" WorkingDirectory="%(_CLUTestProjects.RootDir)%(_CLUTestProjects.Directory)" />
322+
<!--<CallTarget Targets="InvokeXUnit"/>-->
302323
</Target>
303324

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

src/CLU.sln

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

0 commit comments

Comments
 (0)