Merge remote-tracking branch 'refs/remotes/Azure/preview' into preview

Author: karravi-msft

.gitignore

@@ -26,6 +26,7 @@ app.config
 *.userprefs
 *.sln.docstates
 .vscode
+*.userosscache
 
 # Build results
 [Dd]ebug/
@@ -217,6 +218,8 @@ pingme.txt
 groupMapping*.json
 /tools/index.json
 /Package/index.json
+/tools/outputtypes.json
+/Package/outputtypes.json
 
 *.msi
 *.wixpdb
@@ -229,3 +232,6 @@ Package
 .idea
 /src/ResourceManager/RecoveryServices.Backup/**/bin
 launchSettings.json
+/src/StackAdmin/AzureRM/AzureRM.psm1
+/src/StackAdmin/AzureStack/AzureStack.psm1
+/tools/AzureRM.Netcore/AzureRM.Netcore.psm1

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: csharp
 mono: none
-dotnet: 2.1.2
+dotnet: 2.1.200
 dist: trusty
 
 env:
@@ -19,9 +19,11 @@ before_install:
  - sudo apt-get install -y powershell
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
 
+ # https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
 script:
- - dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG
- - dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter="AcceptanceType=CheckIn" --configuration $CONFIG
+ - sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
+ - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
+ - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
 
 after_success:
  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

Azure.PowerShell.Netcore.sln

@@ -6,7 +6,7 @@
 		<ScenarioTestDebug>.\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
 		<CommonTestDebug>.\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
 		<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
-		<RecoveryServicesBackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
+		<RecoveryServicesBackupTestDebug>.\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
 		<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
 		<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
 		<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
@@ -54,49 +54,38 @@
 		Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
 		ContinueOnError="false" />
 	</Target>
-	<Target Name="DeclareXunitTests">
-    <!--Get list of tests to be run based on files changed from a specified PullRequestNumber. Mapping between paths and test DLLs is used to produce the list.-->
-    <SmartTestingTask  RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" MapFilePath=".\TestMappings.json">
-      <Output TaskParameter ="TestAssemblies" ItemName="XUnitTests"/>
-    </SmartTestingTask>
-	<Message Text="Using these test assemblies:"/>
-	<Message Text="%(XUnitTests.Identity)"/>
-	<Message Text="Total: @(XunitTests->Count())"/>			
-	</Target>
 
-	<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
+	<Target Name="InvokeXUnit">
 		<Message Importance="high" Text="Running XUnit tests" />
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 
-		<xunit 
-			Assemblies="@(XUnitTests)" 
+		<xunit
+			Assemblies="@(XUnitTests)"
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			IncludeTraits="AcceptanceType=CheckIn"
 			Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
-			MaxParallelThreads="10"
 			DiagnosticMessages="false"
-			ContinueOnError="false" 
+			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>
 	</Target>
 
-	<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
+	<Target Name="InvokeXUnitAll">
 		<Message Importance="high" Text="Running XUnit tests" />
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 
-		<xunit 
-			Assemblies="@(XUnitTests)" 
+		<xunit
+			Assemblies="@(XUnitTests)"
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			ExcludeTraits="RunType=LiveOnly;AcceptanceType=CheckIn"
 			Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
-			MaxParallelThreads="10"
 			DiagnosticMessages="false"
-			ContinueOnError="false" 
+			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>
 	</Target>
 
@@ -107,7 +96,7 @@
 	<Target Name="BeforeRunTests">
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 	</Target>
-	
+
 	<Target Name="TestManagement">
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
@@ -258,15 +247,15 @@
 		<Message Importance="high" Text="Running Sql tests" />
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
-	</Target>  
+	</Target>
 
 	<!-- Run the KeyVault tests -->
 	<Target Name="KeyVaultTests">
 		<Message Importance="high" Text="Running KeyVault tests" />
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
 	</Target>
-    
+
     <!-- Run the ServiceFabric tests -->
 	<Target Name="ServiceFabricTests">
 		<Message Importance="high" Text="Running ServiceFabric tests" />
@@ -300,7 +289,7 @@
 		<Message Importance="high" Text="Running UsageAggregates tests" />
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
 		IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
-	</Target>  
+	</Target>
 
 	<!-- Run the scenario tests with Mocks -->
 	<Target Name="MockedScenarioTests">
@@ -462,10 +451,10 @@
 	</Target>
 
 	<ItemGroup>
-		<LiveTestDlls Include="$(ResourceManagerTestDebug)" />    
+		<LiveTestDlls Include="$(ResourceManagerTestDebug)" />
 	</ItemGroup>
 
-	<Target Name="LiveTests"> 
+	<Target Name="LiveTests">
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 		<Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe  @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
 	</Target>