Merge branch 'azuremaster' into preview

Author: rileymckenna

src/Blueprint/Blueprint/Az.Blueprint.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 4/18/2019
+# Generated on: 6/11/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.1'
+ModuleVersion = '0.2.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -74,19 +74,12 @@ NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.Blueprint.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzBlueprint',
-                  'Get-AzBlueprintAssignment',
-                  'New-AzBlueprintAssignment',
-                  'Remove-AzBlueprintAssignment',
-                  'Set-AzBlueprintAssignment',
-                  'New-AzBlueprint',
-                  'Publish-AzBlueprint',
-                  'New-AzBlueprintArtifact',
-                  'Get-AzBlueprintArtifact',
-                  'Export-AzBlueprintWithArtifact',
-                  'Import-AzBlueprintWithArtifact',
-                  'Set-AzBlueprintArtifact',
-                  'Set-AzBlueprint'
+CmdletsToExport = 'Get-AzBlueprint', 'Get-AzBlueprintAssignment', 
+               'New-AzBlueprintAssignment', 'Remove-AzBlueprintAssignment', 
+               'Set-AzBlueprintAssignment', 'New-AzBlueprint', 'Publish-AzBlueprint', 
+               'New-AzBlueprintArtifact', 'Get-AzBlueprintArtifact', 
+               'Export-AzBlueprintWithArtifact', 'Import-AzBlueprintWithArtifact', 
+               'Set-AzBlueprintArtifact', 'Set-AzBlueprint'
 
 # Variables to export from this module
 # VariablesToExport = @()
@@ -121,12 +114,15 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Update Remove- cmdlet to not require SubscriptionId parameter
-* Update cmdlet examples 
-* Update Blueprint .NET SDK version
-* Support secure strings as assignment parameters
-* Support WhoIsBlueprint
-     - Get AAD ObjectId of the Blueprints service principal in the tenant'
+        ReleaseNotes = '* Added new cmdlets:
+    - New-AzBlueprint
+    - Set-AzBlueprint
+    - Publish-AzBlueprint
+    - New-AzBlueprintArtifact
+    - Set-AzBlueprintArtifact
+    - Get-AzBlueprintArtifact
+    - Export-AzBlueprintWithArtifact
+    - Import-AzBlueprintWithArtifact'''
 
         # Prerelease string of this module
         # Prerelease = ''

src/Blueprint/Blueprint/ChangeLog.md

@@ -19,9 +19,20 @@
 -->
 ## Upcoming Release
 
+## Version 0.2.0
+* Added new cmdlets:
+    - New-AzBlueprint
+    - Set-AzBlueprint
+    - Publish-AzBlueprint
+    - New-AzBlueprintArtifact
+    - Set-AzBlueprintArtifact
+    - Get-AzBlueprintArtifact
+    - Export-AzBlueprintWithArtifact
+    - Import-AzBlueprintWithArtifact'
+
 ## Version 0.1.1
 * Update Remove- cmdlet to not require SubscriptionId parameter
-* Update cmdlet examples 
+* Update cmdlet examples
 * Update Blueprint .NET SDK version
 * Support secure strings as assignment parameters
 * Support WhoIsBlueprint

src/Blueprint/Blueprint/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.1.1")]
-[assembly: AssemblyFileVersion("0.1.1")]
+[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyFileVersion("0.2.0")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Blueprint.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else