Skip to content

Commit f0b10cd

Browse files
committed
Fixed extra NuGet restoring in build.proj. Updated Stack psd1s so they have blank RootModule so the psm1 is generated.
1 parent 63229e4 commit f0b10cd

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

build.proj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,6 @@
199199
<!-- Restore packages for local build tasks-->
200200
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
201201
ContinueOnError="false" />
202-
<!-- Restore packages for repo tasks tasks-->
203-
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
204-
ContinueOnError="false" />
205-
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
206-
ContinueOnError="false" />
207202
<!--Restore the xunit runner needed to run unit tests-->
208203
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
209204
</Target>

src/StackAdmin/AzureRM/AzureRM.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# RootModule
12-
RootModule = "AzureRM.psm1"
12+
# RootModule = ''
1313

1414
# Version number of this module.
1515
ModuleVersion = '2.3.0.1'

src/StackAdmin/AzureStack/AzureStack.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Root Module
12-
RootModule = "AzureStack.psm1"
12+
# RootModule = ''
1313

1414
# Version number of this module.
1515
ModuleVersion = '1.5.1'

tools/UpdateModules.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ param(
2929
[string] $BuildConfig,
3030

3131
[Parameter(Mandatory = $false, Position = 1)]
32-
[ValidateSet("All", "Latest", "Stack", "NetCore","ServiceManagement","AzureStorage")]
32+
[ValidateSet("All", "Latest", "Stack", "NetCore", "ServiceManagement", "AzureStorage")]
3333
[string] $Scope
3434
)
3535

0 commit comments

Comments
 (0)