Skip to content

Commit 583ab32

Browse files
pashuklpashukl
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview
2 parents de0cb19 + 64a4a05 commit 583ab32

File tree

1,838 files changed

+4996
-1034203
lines changed

Some content is hidden

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

1,838 files changed

+4996
-1034203
lines changed

‎NuGet.config renamed to ‎NuGet.Config

File renamed without changes.

‎build.proj

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,11 @@
8787

8888

8989
<ItemGroup>
90-
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
91-
<StackSolution Include="$(LibrarySourceFolder)\Stack.sln" Condition="'$(Scope)' == 'Stack'"/>
92-
<CommonSolution Include="$(LibrarySourceFolder)\Common\Common.sln" Condition="'$(Scope)' == 'Stack'" />
90+
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
91+
<StackSolution Include="$(LibrarySourceFolder)\StackAdmin\Stack.sln" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
9392
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
9493
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
95-
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
94+
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
9695
</ItemGroup>
9796

9897
<!-- Tasks -->
@@ -200,10 +199,8 @@
200199
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
201200
<!-- Restore packages -->
202201
<Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
203-
Condition="'$(Scope)' == 'Stack'"
202+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
204203
ContinueOnError="false" />
205-
<Exec Command="$(NuGetCommand) restore %(CommonSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
206-
ContinueOnError="false" Condition="'$(Scope)' == 'Stack'" />
207204
<!-- Restore packages for static analysis-->
208205
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
209206
ContinueOnError="false" />
@@ -280,14 +277,7 @@
280277
<MakeDir Directories="$(PackageDirectory)"
281278
Condition="'$(Scope)' != 'Stack'" />
282279
<MakeDir Directories="$(StackPackageFolder)"
283-
Condition="'$(Scope)' == 'Stack'" />
284-
285-
<MSBuild Projects="@(CommonSolution)"
286-
Targets="Build"
287-
Properties="Configuration=$(Configuration);Platform=Any CPU"
288-
BuildInParallel="$(BuildInParallel)"
289-
Condition="'$(Scope)' == 'Stack'"
290-
ContinueOnError="false" />
280+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
291281

292282
<MSBuild Projects="@(CmdletSolutionsToBuild)"
293283
Targets="Build"
@@ -299,7 +289,7 @@
299289
Targets="Build"
300290
Properties="Configuration=$(Configuration);Platform=Any CPU"
301291
BuildInParallel="$(BuildInParallel)"
302-
Condition="'$(Scope)' == 'Stack'"
292+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
303293
ContinueOnError="false" />
304294

305295
<Exec Command="$(PowerShellCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) -FilteredModules '@(ModulesChanged)' &quot;"
@@ -311,61 +301,61 @@
311301

312302
<Exec ContinueOnError="false"
313303
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
314-
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
304+
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
315305

316306
<!-- Copying modules to be signed -->
317307

318308
<!-- AzureRM -->
319309
<Copy SourceFiles="$(LibraryToolsFolder)\AzureRM\AzureRM.psd1"
320310
DestinationFolder="$(PackageDirectory)\$(Configuration)"
321311
ContinueOnError="false"
322-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
312+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
323313
<Copy SourceFiles="$(LibraryToolsFolder)\AzureRM\AzureRM.psm1"
324314
DestinationFolder="$(PackageDirectory)\$(Configuration)"
325315
ContinueOnError="false"
326-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
316+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
327317

328318
<!-- Stack Specific -->
329319
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psd1"
330320
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
331321
ContinueOnError="false"
332-
Condition= " '$(Scope)' == 'Stack' "/>
322+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
333323
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
334324
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
335325
ContinueOnError="false"
336-
Condition= " '$(Scope)' == 'Stack' "/>
326+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
337327

338328
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psd1"
339329
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
340330
ContinueOnError="false"
341-
Condition= " '$(Scope)' == 'Stack' "/>
331+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
342332
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
343333
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
344334
ContinueOnError="false"
345-
Condition= " '$(Scope)' == 'Stack' "/>
335+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
346336

347337
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
348338

349339
<Exec ContinueOnError="false"
350340
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;"
351-
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
341+
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
352342

353343
<!-- AzureRM -->
354344
<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psd1"
355-
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
345+
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
356346
<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psm1"
357-
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
347+
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
358348

359349
<!-- Stack -->
360350
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psd1"
361-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
351+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
362352
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psm1"
363-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
353+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
364354

365355
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psd1"
366-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
356+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
367357
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psm1"
368-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
358+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
369359

370360
<Message Importance="high" Text="Running Static Analyser" />
371361
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
@@ -474,11 +464,11 @@
474464
</ItemGroup>
475465

476466
<!-- Stack -->
477-
<ItemGroup Condition="'$(Scope)' == 'Stack'">
478-
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
467+
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
468+
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Exclude="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*Common*.dll" />
479469
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
480470
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" />
481-
</ItemGroup>
471+
</ItemGroup>
482472

483473
<Message Importance="high" Text="$(PackageDirectory)\$(Configuration) does not contains any files to sign. Code sign will skip."
484474
Condition="'@(DelaySignedAssembliesToSign)' == ''" />
@@ -515,11 +505,11 @@
515505

516506
<!-- Copying shortcut to be signed -->
517507
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
518-
DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition= "'$(Scope)' == 'All' or '$(Scope)' == 'Latest'"/>
508+
DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
519509
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
520-
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
510+
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
521511
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
522-
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
512+
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
523513

524514

525515
<!-- Azure -->
@@ -531,7 +521,7 @@
531521
</ItemGroup>
532522

533523
<!-- Stack -->
534-
<ItemGroup Condition="'$(Scope)' == 'Stack'">
524+
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
535525
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1"/>
536526
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.psm1"/>
537527
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1xml"/>
@@ -554,7 +544,7 @@
554544
ContinueOnError="ErrorAndContinue" />
555545

556546
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(StackPackageFolder)\$(Configuration) &quot;"
557-
Condition="'$(Scope)' == 'Stack'"
547+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
558548
ContinueOnError="ErrorAndContinue" />
559549

560550
<!-- Copying signed shortcut back -->
@@ -621,7 +611,7 @@
621611
Condition="'$(Scope)' != 'Stack'"/>
622612

623613
<Exec Command="$(PackageDirectory)\StaticAnalysis.exe $(StackPackageFolder)\$(Configuration) $(StackPackageFolder)"
624-
Condition="'$(Scope)' == 'Stack'"
614+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
625615
ContinueOnError="True"/>
626616

627617
<OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
@@ -650,11 +640,11 @@
650640
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
651641

652642
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\PublishModules.ps1 -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope $(Scope) -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot; &quot; -NugetExe $(NuGetCommand)"
653-
Condition="'$(Scope)' !='Stack'"
643+
Condition="'$(Scope)' != 'Stack'"
654644
ContinueOnError="false"/>
655645

656646
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\PublishModules.ps1 -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope Stack -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot; &quot; -NugetExe $(NuGetCommand)"
657-
Condition="'$(Scope)' == 'Stack'"
647+
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
658648
ContinueOnError="false"/>
659649

660650
<CallTarget Targets="BuildInstaller" Condition="'$(Scope)' =='All'" />

‎src/Azure.PowerShell.Netcore.Test.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DeviceProvisioning
3333
EndProject
3434
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.PolicyInsights.Test.Netcore", "ResourceManager\PolicyInsights\Commands.PolicyInsights.Test\Commands.PolicyInsights.Test.Netcore.csproj", "{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}"
3535
EndProject
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Resources.Test.Netcore", "ResourceManager\Resources\Commands.Resources.Test\Commands.Resources.Test.Netcore.csproj", "{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}"
37+
EndProject
3638
Global
3739
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3840
Debug|Any CPU = Debug|Any CPU
@@ -223,6 +225,18 @@ Global
223225
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x64.Build.0 = Release|Any CPU
224226
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x86.ActiveCfg = Release|Any CPU
225227
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x86.Build.0 = Release|Any CPU
228+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
229+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|Any CPU.Build.0 = Debug|Any CPU
230+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|x64.ActiveCfg = Debug|Any CPU
231+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|x64.Build.0 = Debug|Any CPU
232+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|x86.ActiveCfg = Debug|Any CPU
233+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Debug|x86.Build.0 = Debug|Any CPU
234+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|Any CPU.ActiveCfg = Release|Any CPU
235+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x64.ActiveCfg = Release|Any CPU
237+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x64.Build.0 = Release|Any CPU
238+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x86.ActiveCfg = Release|Any CPU
239+
{50DEDB9D-D379-43CF-9A0F-6C366B4AE400}.Release|x86.Build.0 = Release|Any CPU
226240
EndGlobalSection
227241
GlobalSection(SolutionProperties) = preSolution
228242
HideSolutionNode = FALSE

‎src/Common/NuGet.config renamed to ‎src/Common/NuGet.Config

File renamed without changes.

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,13 @@ private void SetupPowerShellModules(System.Management.Automation.PowerShell powe
667667
foreach (string moduleName in modules)
668668
{
669669
powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));
670+
if (moduleName.EndsWith(".psd1"))
671+
{
672+
#if NETSTANDARD
673+
var moduleShortName = moduleName.Split(new string[] { "\\" }, StringSplitOptions.None).Last().Split(new string[] { "/" }, StringSplitOptions.None).Last();
674+
powershell.AddScript("Enable-AzureRmAlias -Module " + moduleShortName.Substring(0, moduleShortName.Length - 5));
675+
#endif
676+
}
670677
}
671678

672679
powershell.AddScript(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
16+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
1818
<NuGetPackageImportStamp>1017a61d</NuGetPackageImportStamp>
1919
</PropertyGroup>

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
16+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
1818
<CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
1919
</PropertyGroup>

0 commit comments

Comments
 (0)