Skip to content

Commit 7065b47

Browse files
vivermviverm
committed
Merge conflicts
2 parents b823d3a + a32b457 commit 7065b47

File tree

512 files changed

+6778
-19808
lines changed

Some content is hidden

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

512 files changed

+6778
-19808
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,6 @@ launchSettings.json
235235
/src/StackAdmin/AzureRM/AzureRM.psm1
236236
/src/StackAdmin/AzureStack/AzureStack.psm1
237237
/tools/AzureRM.Netcore/AzureRM.Netcore.psm1
238+
/ModuleMappings.json
239+
/SolutionMappings.json
240+
/TestMappings.json

‎Azure.PowerShell.Netcore.sln

Lines changed: 0 additions & 210 deletions
Large diffs are not rendered by default.

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<TestSettings>.\src\Local.testsettings</TestSettings>
55
<TestSettings_x64>.\src\Local.x64.testsettings</TestSettings_x64>
66
<ScenarioTestDebug>.\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
7-
<CommonTestDebug>.\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
87
<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
98
<RecoveryServicesBackupTestDebug>.\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
109
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
@@ -14,7 +13,7 @@
1413
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
1514
<AzureRTSeqTestSettings>.\src\AzureRTSeq.testsettings</AzureRTSeqTestSettings>
1615
<AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
17-
<StorageScenarioTestDebug>src\Common\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
16+
<StorageScenarioTestDebug>src\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
1817
<ManagementTestDebug>.\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll</ManagementTestDebug>
1918
<ResourceManagerTestDebug>.\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll</ResourceManagerTestDebug>
2019
<DataFactoryManagerTestDebug>.\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll</DataFactoryManagerTestDebug>
@@ -240,13 +239,6 @@
240239
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
241240
</Target>
242241

243-
<!-- Run the common tests -->
244-
<Target Name="CommonTests">
245-
<Message Importance="high" Text="Running Common tests" />
246-
<Xunit.Runner.MSBuild.xunit Assemblies="$(CommonTestDebug)" Html="$(TestOutputDirectory)\CommonTests.xunit.dll.html" Verbose="false"
247-
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
248-
</Target>
249-
250242
<!-- Run the Compute tests -->
251243
<Target Name="ComputeTests">
252244
<Message Importance="high" Text="Running Compute tests" />

‎NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@
66
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
77
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
88
</packageSources>
9-
<disabledPackageSources>
10-
</disabledPackageSources>
119
</configuration>

‎build.proj

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888

8989
<ItemGroup>
9090
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
91-
<StackSolution Include="$(LibrarySourceFolder)\Stack.sln" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"/>
92-
<CommonSolution Include="$(LibrarySourceFolder)\Common\Common.sln" />
91+
<StackSolution Include="$(LibrarySourceFolder)\Stack.sln" Condition="'$(Scope)' == 'Stack'"/>
92+
<CommonSolution Include="$(LibrarySourceFolder)\Common\Common.sln" Condition="'$(Scope)' == 'Stack'" />
9393
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
9494
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
9595
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
@@ -200,10 +200,10 @@
200200
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
201201
<!-- Restore packages -->
202202
<Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
203-
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
203+
Condition="'$(Scope)' == 'Stack'"
204204
ContinueOnError="false" />
205205
<Exec Command="$(NuGetCommand) restore %(CommonSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
206-
ContinueOnError="false" />
206+
ContinueOnError="false" Condition="'$(Scope)' == 'Stack'" />
207207
<!-- Restore packages for static analysis-->
208208
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
209209
ContinueOnError="false" />
@@ -280,12 +280,13 @@
280280
<MakeDir Directories="$(PackageDirectory)"
281281
Condition="'$(Scope)' != 'Stack'" />
282282
<MakeDir Directories="$(StackPackageFolder)"
283-
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
283+
Condition="'$(Scope)' == 'Stack'" />
284284

285285
<MSBuild Projects="@(CommonSolution)"
286286
Targets="Build"
287287
Properties="Configuration=$(Configuration);Platform=Any CPU"
288288
BuildInParallel="$(BuildInParallel)"
289+
Condition="'$(Scope)' == 'Stack'"
289290
ContinueOnError="false" />
290291

291292
<MSBuild Projects="@(CmdletSolutionsToBuild)"
@@ -298,7 +299,7 @@
298299
Targets="Build"
299300
Properties="Configuration=$(Configuration);Platform=Any CPU"
300301
BuildInParallel="$(BuildInParallel)"
301-
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
302+
Condition="'$(Scope)' == 'Stack'"
302303
ContinueOnError="false" />
303304

304305
<Exec Command="$(PowerShellCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) -FilteredModules '@(ModulesChanged)' &quot;"
@@ -328,20 +329,20 @@
328329
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psd1"
329330
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
330331
ContinueOnError="false"
331-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
332+
Condition= " '$(Scope)' == 'Stack' "/>
332333
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
333334
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
334335
ContinueOnError="false"
335-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
336+
Condition= " '$(Scope)' == 'Stack' "/>
336337

337338
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psd1"
338339
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
339340
ContinueOnError="false"
340-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
341+
Condition= " '$(Scope)' == 'Stack' "/>
341342
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
342343
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
343344
ContinueOnError="false"
344-
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
345+
Condition= " '$(Scope)' == 'Stack' "/>
345346

346347
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
347348

@@ -357,14 +358,14 @@
357358

358359
<!-- Stack -->
359360
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psd1"
360-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
361+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
361362
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psm1"
362-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
363+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
363364

364365
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psd1"
365-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
366+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
366367
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psm1"
367-
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
368+
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
368369

369370
<Message Importance="high" Text="Running Static Analyser" />
370371
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
@@ -467,13 +468,13 @@
467468

468469
<!-- Azure -->
469470
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest' or '$(Scope)' == 'Netcore'">
470-
<DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
471+
<DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Exclude="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*Commands*Common*.dll" />
471472
<DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
472473
<DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" />
473474
</ItemGroup>
474475

475476
<!-- Stack -->
476-
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
477+
<ItemGroup Condition="'$(Scope)' == 'Stack'">
477478
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
478479
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
479480
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" />
@@ -516,9 +517,9 @@
516517
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
517518
DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition= "'$(Scope)' == 'All' or '$(Scope)' == 'Latest'"/>
518519
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
519-
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"/>
520+
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
520521
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
521-
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"/>
522+
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
522523

523524

524525
<!-- Azure -->
@@ -530,7 +531,7 @@
530531
</ItemGroup>
531532

532533
<!-- Stack -->
533-
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
534+
<ItemGroup Condition="'$(Scope)' == 'Stack'">
534535
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1"/>
535536
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.psm1"/>
536537
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1xml"/>
@@ -553,7 +554,7 @@
553554
ContinueOnError="ErrorAndContinue" />
554555

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

559560
<!-- Copying signed shortcut back -->
@@ -620,7 +621,7 @@
620621
Condition="'$(Scope)' != 'Stack'"/>
621622

622623
<Exec Command="$(PackageDirectory)\StaticAnalysis.exe $(StackPackageFolder)\$(Configuration) $(StackPackageFolder)"
623-
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
624+
Condition="'$(Scope)' == 'Stack'"
624625
ContinueOnError="True"/>
625626

626627
<OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
@@ -653,7 +654,7 @@
653654
ContinueOnError="false"/>
654655

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

659660
<CallTarget Targets="BuildInstaller" Condition="'$(Scope)' =='All'" />
@@ -671,9 +672,9 @@
671672
<Target Name="Test" DependsOnTargets="BeforeRunTests">
672673
<Message Importance="high" Text="Running check in tests..." />
673674

674-
<CallTarget Targets="BinScopeCheck" />
675+
<CallTarget Targets="BinScopeCheck" Condition="'$(OnPremiseBuild)'" />
675676

676-
<CallTarget Targets="RunPoliCheck" />
677+
<CallTarget Targets="RunPoliCheck" Condition="'$(OnPremiseBuild)'" />
677678

678679
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\Modules\Run-UnitTests.ps1 -BuildConfig $(Configuration) -Scope $(Scope) &quot;"
679680
ContinueOnError="ErrorAndContinue"/>
@@ -692,7 +693,7 @@
692693
</Target>
693694

694695
<Target Name="BinScopeCheck">
695-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckBinScope.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) &quot;"
696+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckBinScope.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) -Scope $(Scope) &quot;"
696697
ContinueOnError="False"/>
697698
<OnError ExecuteTargets="BinScopeErrorMessage"/>
698699
</Target>

0 commit comments

Comments
 (0)