Merge pull request Azure#9390 from MiYanni/sql-changelog-fix

Fix entries for recent PR merge

Author: markcowl

src/Sql/Sql.sln

@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2042
@@ -28,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OperationalInsights", "..\O
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monitor", "..\Monitor\Monitor\Monitor.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyVault", "..\KeyVault\KeyVault\KeyVault.csproj", "{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -82,13 +85,21 @@ Global
 		{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{98CFD96B-A6BC-4F15-AE2C-603FC2B58981} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{1E60D2AC-DEA7-403C-86DC-7B8C47F54668} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{5BE35A94-C20F-4659-AA29-9B9AEBCFAF36} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{DEA446A1-84E2-46CC-B780-EB4AFDE2460E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{9BDC0965-CC31-4767-9D8C-BAF4C0DB3C06} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0F86E3C6-681C-4369-A21D-70F61B6CD6F8}

src/Sql/Sql/ChangeLog.md

@@ -20,6 +20,12 @@
 ## Upcoming Release
 * Fix Advanced Threat Protection storage endpoint suffix
 * Fix Advanced Data Security enable overrides Advanced Threat Protection policy
+* New Cmdlets for Management.Sql to allow customers to add TDE keys and set TDE protector for managed instances
+   - Add-AzSqlInstanceKeyVaultKey
+   - Get-AzSqlInstanceKeyVaultKey
+   - Remove-AzSqlInstanceKeyVaultKey
+   - Get-AzSqlInstanceTransparentDataEncryptionProtector
+   - Set-AzSqlInstanceTransparentDataEncryptionProtector
 
 ## Version 1.11.0
 * Add DnsZonePartner Parameter for New-AzureSqlInstance cmdlet to support AutoDr for Managed Instance.
@@ -30,12 +36,6 @@
 
 ## Version 1.10.0
 * Rename Advanced Threat Protection cmdlets to Advanced Data Security and enable Vulnerability Assessment by default
-* New Cmdlets for Management.Sql to allow customers to add TDE keys and set TDE protector for managed instances
-   - Add-AzSqlInstanceKeyVaultKey
-   - Get-AzSqlInstanceKeyVaultKey
-   - Remove-AzSqlInstanceKeyVaultKey
-   - Get-AzSqlInstanceTransparentDataEncryptionProtector
-   - Set-AzSqlInstanceTransparentDataEncryptionProtector
 
 ## Version 1.9.0
 * Replace dependency on Monitor SDK with common code