merge upstream

Author: maddieclayton

.gitignore

@@ -215,6 +215,10 @@ FakesAssemblies/
 *.GhostDoc.xml
 pingme.txt
 groupMapping*.json
+
+*.msi
+*.wixpdb
+
 .vscode/
 /tools/AutomationTestFramework/RunBooks
 /tools/AutomationTestFramework/TestHelpers/TestHelpers.zip

AzurePowershell.Test.targets

@@ -81,8 +81,6 @@
 			DiagnosticMessages="false"
 			ContinueOnError="false" 
 			Condition=" @(XUnitTests) != '' "/>
-		
-		<CallTarget Targets="TestSetup" />
 	</Target>
 
 	<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
@@ -101,8 +99,6 @@
 			DiagnosticMessages="false"
 			ContinueOnError="false" 
 			Condition=" @(XUnitTests) != '' "/>
-	
-		<CallTarget Targets="TestSetup" />
 	</Target>
 
 	<Target Name="TimeoutErrorHandler">
@@ -112,54 +108,6 @@
 	<Target Name="BeforeRunTests">
 		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
 	</Target>
-
-	<Target Name="TestSetup">
-		<Message Importance="high" Text="Setup XUnit tests" />
-		<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-		
-		<Message Text="Copying test assets" />
-		<!-- We copy this file right after we build setup test for signing, so now copying the signed copy back where it is needed for the test -->
-		<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\PowerShellSetup.Test.dll"
-			DestinationFolder="$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)" Condition="Exists('$(PackageDirectory)\$(Configuration)\PowerShellSetup.Test.dll')" />
-	
-		<Copy SourceFiles="$(SignedOutputRootDir)\AzurePowerShell.msi"
-			DestinationFolder="$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)" Condition="Exists('$(SignedOutputRootDir)\AzurePowerShell.msi')" />
-	
-		<ItemGroup Condition=" '$(scope)' == 'all' AND '$(CodeSign)' != 'true' ">
-			<SetupDebugTests Include=".\setup\PowerShellSetup.Test\bin\Debug\PowerShellSetup.Test.dll" />
-		</ItemGroup>
-		
-		<ItemGroup Condition=" '$(Configuration)' == 'Release' AND '$(scope)' == 'all' AND '$(CodeSign)' == 'true' ">
-			<!-- We want to run setup tests related to signing that can only be run on signed bits -->
-			<SetupReleaseTests Include=".\setup\PowerShellSetup.Test\bin\Release\PowerShellSetup.Test.dll" />
-		</ItemGroup>
-		<xunit 
-			Assemblies="@(SetupDebugTests)"
-			AppDomains="true"
-			ShadowCopy="false"
-			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
-			IncludeTraits="AcceptanceType=CheckIn"
-			ExcludeTraits="SignedBuild=BVT"
-			Html="$(TestOutputDirectory)\AzPsSetupTest.html"
-			MaxParallelThreads="10"
-			DiagnosticMessages="false"
-			ContinueOnError="false"
-			Condition=" '$(scope)' == 'all' "/>
-			
-		<xunit 
-			Assemblies="@(SetupReleaseTests)"
-			AppDomains="true"
-			ShadowCopy="false"
-			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
-			IncludeTraits="SignedBuild=BVT"
-			Html="$(TestOutputDirectory)\AzPsSetupTestSigned.html"
-			MaxParallelThreads="10"
-			DiagnosticMessages="false"
-			ContinueOnError="false"
-			Condition=" '$(Configuration)' == 'Release' AND '$(scope)' == 'all' AND '$(CodeSign)' == 'true' "/>
-	</Target>
 
 	<Target Name="TestManagement">
 		<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"

build.proj

@@ -12,12 +12,15 @@
 
     /t:Test
       Runs tests
+    
+    /t:Publish
+      Creates local nuget packages and MSI
 
     /p:CodeSign=True
       Code sign binaries, mainly for official release. Default is false.
 
     /p:CodeSign=True;DelaySign=True
-      Test the code sign workflow locally. 
+      Test the code sign workflow locally.
 
     /p:Scope
       'ServiceManagement': service management
@@ -26,7 +29,7 @@
       By default, it builds all
 
     /p:SkipHelp=True
-      Skips help generation and installer creation, mainly for local builds to save time.
+      Skips help generation, mainly for local builds to save time.
   -->
 
   <!-- Define build properties -->
@@ -42,7 +45,6 @@
     <DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
     <SignedOutputRootDir>$(LibraryRoot)signed</SignedOutputRootDir>
     <BuildOutputDirectory>$(PublishDirectory)\Build</BuildOutputDirectory>
-    <SetupOutputDirectory>$(PublishDirectory)\Setup</SetupOutputDirectory>
     <TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
     <BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
     <NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
@@ -67,7 +69,6 @@
     <CmdletSolutionsToBuild Include=".\src\Stack.sln"
                             Condition=" '$(Stack)' == 'true' "/>
 
-    <SetupSln Include=".\setup\azurepowershell.sln" />
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
     <LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
   </ItemGroup>
@@ -181,8 +182,6 @@
     <!-- Restore packages for local build tasks-->
     <Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetLocalBuildTaskPackages)"
             ContinueOnError="false" />
-    <Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
-            ContinueOnError="false" />
 
     <!--Restore the xunit runner needed to run unit tests-->
     <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
@@ -208,7 +207,6 @@
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
       ContinueOnError="false"
       Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
-    <CallTarget Targets="BuildSetupTest"/>
  <!-- moved copy tasks -->
 
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'"/>    
@@ -228,13 +226,6 @@
     <Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
           DestinationFolder="$(LibrarySourceFolder)\Stack\$(Configuration)" Condition= " '$(NetCore)' == 'false' and '$(Stack)' == 'true' and '$(CodeSign)' == 'false'"/>
 
-    <Copy SourceFiles="$(LibraryRoot)setup\Setup\RemoveGalleryModules.ps1"
-      DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)"
-      Condition=" '$(CodeSign)' == 'true' "/>
-    <Copy SourceFiles="$(LibraryRoot)setup\Setup\SetExecutionPolicy.ps1"
-      DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)"
-      Condition=" '$(CodeSign)' == 'true' "/>
-
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " /> 
 
 
@@ -252,9 +243,6 @@
           DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(NetCore)' == 'false' and '$(Stack)' == 'true' "/>
 <!-- moved copy tasks -->
 
-    <CallTarget Targets="BuildSetup" Condition=" '$(SkipHelp)' == 'false' "/>
-    <CallTarget Targets="CodeSignInstaller"
-                Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
     <Message Importance="high" Text="Running Static Analyser" />
     <CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
@@ -266,8 +254,6 @@
 
     <!-- Build and create package content -->
     <Exec Command="dotnet --version"/>
-    <Exec Command="dotnet restore Azure.PowerShell.Netcore.sln"/>
-    <Exec Command="dotnet build Azure.PowerShell.Netcore.sln -c $(Configuration)"/>
     <Exec Command="dotnet publish Azure.PowerShell.Netcore.sln -c $(Configuration)"/>
 
     <!-- Delete powershell runtime files -->
@@ -312,9 +298,9 @@
     <Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>
 
     <!-- Update module manifests. -->
-    <Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'"/>
+    <Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'" ContinueOnError="false" />
 
-    <!-- Generate the help. -->
+     <!-- Generate the help. -->
     <Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
 
     <!-- Cleanup extraneous files. -->
@@ -327,32 +313,6 @@
   <Target
     Name="Full"
     DependsOnTargets="Clean;Build;Test" />
-
-  <Target Name="BuildSetupTest" Condition=" '$(Scope)' == 'all' ">
-    <MSBuild
-      Projects=".\setup\PowerShellSetup.Test\PowerShellSetup.Test.csproj"
-      Targets="Build"
-      Properties="Configuration=$(Configuration);Platform=AnyCPU"
-      ContinueOnError="false"
-      Condition=" '$(Scope)' == 'all' "/>
-    
-    <Copy SourceFiles="$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)\PowerShellSetup.Test.dll"
-      DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition="Exists('$(LibraryRoot)\setup\PowerShellSetup.Test\bin\$(Configuration)\PowerShellSetup.Test.dll')" />    
-  </Target>
-  
-  <Target Name="BuildSetup" Condition=" '$(Scope)' == 'all' ">
-    <!-- Copying shortcut to be signed -->
-    <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\RemoveGalleryModules.ps1;$(LibrarySourceFolder)\Package\$(Configuration)\SetExecutionPolicy.ps1"
-      DestinationFolder="$(LibraryRoot)setup\Setup\"
-      Condition=" '$(CodeSign)' == 'true' "/>
-
-    <MSBuild
-      Projects="@(SetupSln)"
-      Targets="Build"
-      Properties="Configuration=$(Configuration);Platform=Any CPU"
-      ContinueOnError="false"
-      Condition=" '$(Scope)' == 'all' "/>
-  </Target>
 
   <Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">
     <MSBuild Projects="@(LocalBuildTasks)"
@@ -376,7 +336,6 @@
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Condition="'$(Latest)' == 'true' " />
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" Condition="'$(Latest)' == 'true' " />
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" Condition="'$(Latest)' == 'true' " />
-      <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\PowerShellSetup.Test.dll" Condition= " '$(Latest)' == 'true' and '$(NetCore)' == 'false' "/>
 
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Condition="'$(Stack)' == 'true' " />
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" Condition="'$(Stack)' == 'true' " />
@@ -429,13 +388,11 @@
       <ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.psm1" Condition="'$(Latest)' == 'true' " />
       <ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.ps1xml" Condition="'$(Latest)' == 'true' " />
       <ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.js" Condition="'$(Latest)' == 'true' " />
-      <ScriptsToSign Include="$(LibraryRoot)setup\Setup\*.ps1" Condition="'$(Latest)' == 'true' "/>
 
       <ScriptsToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\*.ps1" Condition="'$(Stack)' == 'true' "/>
       <ScriptsToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\*.psm1" Condition="'$(Stack)' == 'true' " />
       <ScriptsToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\*.ps1xml" Condition="'$(Stack)' == 'true' " />
       <ScriptsToSign Include="$(LibrarySourceFolder)\Stack\$(Configuration)\**\*.js" Condition="'$(Stack)' == 'true' " />
-      <!-- <ScriptsToSign Include="$(LibraryRoot)stacksetup\Setup\*.ps1" Condition="'$(Stack)' == 'true' " /> -->
     </ItemGroup>
 
     <CodeSigningTask
@@ -449,16 +406,6 @@
       ToolsPath="$(CIToolsPath)"
       Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
 
-    <!-- We cannot verify .js files using Get-AuthenticodeSignature -->
-    <VerifyAuthenticodeSignatureTask ProbingDirectory="$(PackageDirectory)\$(Configuration)"
-                    FileFilterPattern="microsoft.*.dll;system.*.dll;*.ps1;*.psm1;*.ps1xml;PowerShellSetup.Test.dll" Condition="'$(Latest)' == 'true'">
-      <Output TaskParameter="AuthCodeSignTaskErrorsDetected" PropertyName="AuthTaskFailed" />
-    </VerifyAuthenticodeSignatureTask>
-    <VerifyAuthenticodeSignatureTask ProbingDirectory="$(LibrarySourceFolder)\Stack\$(Configuration)"
-                    FileFilterPattern="microsoft.*.dll;system.*.dll;*.ps1;*.psm1;*.ps1xml;PowerShellSetup.Test.dll" Condition="'$(Latest)' == 'true'">
-      <Output TaskParameter="AuthCodeSignTaskErrorsDetected" PropertyName="AuthTaskFailed" />
-    </VerifyAuthenticodeSignatureTask>
-
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(LibrarySourceFolder)\Package\$(Configuration) &quot;"
         ContinueOnError="ErrorAndContinue" />
 
@@ -467,6 +414,14 @@
           DestinationFolder="$(LibraryRoot)tools\AzureRM.NetCore" Condition= " '$(NetCore)' == 'true' "/>
   </Target>
 
+  <Target Name="BuildInstaller">
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Register-PSRepository -Name MSIcreationrepository -SourceLocation $(PackageDirectory) -InstallationPolicy Trusted &quot; " Condition=" '$(Scope)' == 'all'"/>
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryRoot)\setup\generate.ps1 -repository MSIcreationrepository &quot; " Condition=" '$(Scope)' == 'all'"/>
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Unregister-PSRepository -Name MSIcreationrepository &quot; " Condition=" '$(Scope)' == 'all'"/>
+    <CallTarget Targets="CodeSignInstaller"
+                Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
+  </Target>
+
   <Target Name="CodeSignInstaller">
     <PropertyGroup>
       <!--public token associated with MSSharedLibKey.snk-->
@@ -477,7 +432,7 @@
     </GetFrameworkSdkPath>
 
     <ItemGroup>
-      <InstallersToSign Include="$(LibraryRoot)\setup*\build\**\*.msi" />
+      <InstallersToSign Include="$(LibraryRoot)\setup\*.msi" />
     </ItemGroup>
 
     <Message Importance="high" Text="$(LibraryRoot)\setup does not contains any installers to sign. Code sign will skip."
@@ -523,7 +478,9 @@
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(NetCore) $(Configuration) $(Scope) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot; -Profile Latest &quot; $(NuGetCommand)" Condition="'$(Latest)' == 'true' "/>
      <Message Importance="high" Text="Publishing Cmdlets using Stack profile" Condition="'$(Stack)' == 'true' "/>
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(NetCore) $(Configuration) $(Scope) $(NuGetKey) \&quot;$(StackPublishingSource)\&quot; -Profile Stack &quot; $(NuGetCommand)" Condition="'$(Stack)' == 'true' " />
- </Target>
+    
+    <CallTarget Targets="BuildInstaller" />
+  </Target>
 
   <PropertyGroup>
     <RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
@@ -556,4 +513,4 @@
     <Message Importance="high" Text="Running live tests..." />
     <CallTarget Targets="LiveTests"/>
   </Target>
-</Project>
+</Project>

documentation/development-docs/azure-powershell-developer-guide.md

@@ -215,13 +215,15 @@ The `Commands.ScenarioTests.Common` project can be found in `src/ResourceManager
 The following is a list of additional common code projects that can be used:
 
 - `Commands.Common.Authorization`
-    - Found in `src/ResourceManager/Common/Commands.Common.Authorization`
+    - Found in `src/Common/Commands.Common.Authorization`
+- `Commands.Common.Compute`
+    - Found in `src/Common/Commands.Common.Compute`
 - `Commands.Common.Graph.RBAC`
-    - Found in `src/ResourceManager/Common/Commands.Common.Graph.RBAC`
+    - Found in `src/Common/Commands.Common.Graph.RBAC`
 - `Commands.Common.Network`
-    - Found in `src/ResourceManager/Common/Commands.Common.Network`
+    - Found in `src/Common/Commands.Common.Network`
 - `Commands.Common.Storage`
-    - Found in `src/ResourceManager/Common/Commands.Common.Storage`
+    - Found in `src/Common/Commands.Common.Storage`
 
 # Creating Cmdlets