Merge branch 'preview' into fixdefault

Author: Maddie Clayton

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fix issue with Default Resource Group in CloudShell
+* Fixed issue with cleaning up scripts in build
 
 ## Version 0.6.4
 * Fixed issue with importing aliases

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/StartupScripts/AnalysisServicesDataplaneStartup.ps1 renamed to src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/StartupScripts/AzureAnalysisServicesStartup.ps1

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fix issue with Default Resource Group in CloudShell
+* Fixed issue with cleaning up scripts in build
 
 ## Version 4.2.0
 * Fixed issue with importing aliases

src/ResourceManager/Cdn/ChangeLog.md

@@ -19,6 +19,14 @@
 -->
 
 ## Current Release
+* Updated the ADF .Net SDK to version 0.6.0-preview containing the following changes:
+    - Added new AzureDatabricks LinkedService and DatabricksNotebook Activity
+    - Added headNodeSize and dataNodeSize properties in HDInsightOnDemand LinkedService
+    - Added LinkedService, Dataset, CopySource for SalesforceMarketingCloud
+    - Added support for SecureOutput on all activities 
+    - Added new BatchCount property on ForEach activity which control how many concurrent activities to run
+    - Added new Filter Activity
+    - Added Linked Service Parameters support
 
 ## Version 0.5.1
 * Add parameter "SetupScriptContainerSasUri" and "Edition" for "Set-AzureRmDataFactoryV2IntegrationRuntime" cmd to enable custom setup and edition selection functionality

src/ResourceManager/Cdn/Commands.Cdn/StartupScripts/CdnStartup.ps1 renamed to src/ResourceManager/Cdn/Commands.Cdn/StartupScripts/AzureRmCdnStartup.ps1

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fix issue with Default Resource Group in CloudShell
+* Fixed issue with cleaning up scripts in build
 
 ## Version 4.3.0
 * Fixed issue with importing aliases

src/ResourceManager/DataFactories/Commands.DataFactoryV2/Changelog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed issue with cleaning up scripts in build
 
 ## Version 4.1.0
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription

src/ResourceManager/OperationalInsights/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed issue with cleaning up scripts in build
 
 ## Version 0.2.2
 * Fixed issue with importing aliases

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StartupScripts/OperationalInsightsStartup.ps1 renamed to src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StartupScripts/AzureRmOperationalInsightsStartup.ps1

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fix issue with Default Resource Group in CloudShell
+* Fixed issue with cleaning up scripts in build
 
 ## Version 4.3.0
 * Fixed issue with importing aliases

src/ResourceManager/RecoveryServices.Backup/ChangeLog.md

@@ -20,6 +20,7 @@
 ## Current Release
 * Fixed the help for Remove-AzureRmWebAppSlot
 * Fix issue with Default Resource Group in CloudShell
+* Fixed issue with cleaning up scripts in build
 
 ## Version 4.2.0
 * Fixed issue with importing aliases

src/ResourceManager/RecoveryServices.SiteRecovery/ChangeLog.md

@@ -43,4 +43,15 @@ foreach ($RMFolder in $resourceManagerFolders)
     Write-Verbose "Removing redundant dlls in $($RMFolder.Name)"
     $removedDlls = Get-ChildItem -Path $RMFolder.FullName -Filter "*.dll" | where { $acceptedDlls -notcontains $_.Name}
     $removedDlls | % { Write-Verbose "Removing $($_.Name)"; Remove-Item $_.FullName -Force }
-}
+
+    Write-Verbose "Removing scripts and psd1 in $($RMFolder.FullName)"
+    if (Test-Path -Path "$($RMFolder.FullName)\StartupScripts")
+    {
+        $scriptName = "$($RMFolder.FullName)\StartupScripts\$($RMFolder.Name.replace('.', ''))Startup.ps1"
+        Write-Verbose $scriptName
+        $removedScripts = Get-ChildItem -Path "$($RMFolder.FullName)\StartupScripts" -Filter "*.ps1" | where { $_.FullName -ne $scriptName }
+        $removedScripts | % { Write-Verbose "Removing $($_.FullName)"; Remove-Item $_.FullName -Force }
+    }
+    $removedPsd1 = Get-ChildItem -Path "$($RMFolder.FullName)" -Filter "*.psd1" | where { $_.FullName -ne "$($RMFolder.FullName)\$($RMFolder.Name).psd1" }
+    $removedPsd1 | % { Write-Verbose "Removing $($_.FullName)"; Remove-Item $_.FullName -Force }
+}