Skip to content

Commit 6b6b762

Browse files
authored
Merge pull request Azure#6591 from cormacpayne/sql-release
Update version for Sql release
2 parents fc1abdf + 7d507d9 commit 6b6b762

17 files changed

+1525
-354
lines changed

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<DesignTime>True</DesignTime>
172172
<DependentUpon>Resources.resx</DependentUpon>
173173
</Compile>
174-
<Compile Include="ScenarioTests\AddTransparentDataEncryptionCertificateTests.cs" />
174+
<Compile Include="ScenarioTests\TDECertificateTests.cs" />
175175
<Compile Include="ScenarioTests\BlobAuditingTests.cs" />
176176
<Compile Include="ScenarioTests\BlobAuditingClassicStorageTests.cs" />
177177
<Compile Include="ScenarioTests\AuditingClassicStorageTests.cs" />
@@ -189,7 +189,7 @@
189189
<Compile Include="ScenarioTests\DatabaseReplicationTests.cs" />
190190
<Compile Include="ScenarioTests\DatabaseCrudTests.cs" />
191191
<Compile Include="ScenarioTests\DataMaskingTests.cs" />
192-
<None Include="ScenarioTests\AddTransparentDataEncryptionCertificateTests.ps1">
192+
<None Include="ScenarioTests\TDECertificateTests.ps1">
193193
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
194194
</None>
195195
<None Include="ScenarioTests\BlobAuditingTests.ps1">
@@ -996,25 +996,25 @@
996996
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerDnsAliasTests\TestServerDnsAliasRemove.json">
997997
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
998998
</None>
999-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerDefaultParameterSetNoPassword.json">
999+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerDefaultParameterSetNoPassword.json">
10001000
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10011001
</None>
1002-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerDefaultParameterSetWithPassword.json">
1002+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerDefaultParameterSetWithPassword.json">
10031003
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10041004
</None>
1005-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerInputObjectParameterSetNoPassword.json">
1005+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerInputObjectParameterSetNoPassword.json">
10061006
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10071007
</None>
1008-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerInputObjectParameterSetWithPassword.json">
1008+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerInputObjectParameterSetWithPassword.json">
10091009
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10101010
</None>
1011-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerResourceIdParameterSetNoPassword.json">
1011+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerResourceIdParameterSetNoPassword.json">
10121012
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10131013
</None>
1014-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerResourceIdParameterSetWithPassword.json">
1014+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerResourceIdParameterSetWithPassword.json">
10151015
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10161016
</None>
1017-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AddTransparentDataEncryptionCertificateTests\TestAddTdeCertificateForSqlServerWithPiping.json">
1017+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TDECertificateTests\TestAddTdeCertificateForSqlServerWithPiping.json">
10181018
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10191019
</None>
10201020
</ItemGroup>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2222
{
23-
public class AddTransparentDataEncryptionCertificateTests : SqlTestsBase
23+
public class TDECertificateTests : SqlTestsBase
2424
{
25-
public AddTransparentDataEncryptionCertificateTests(ITestOutputHelper output) : base(output)
25+
public TDECertificateTests(ITestOutputHelper output) : base(output)
2626
{
2727
}
2828

src/ResourceManager/Sql/Commands.Sql/AzureRM.Sql.psd1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 6/26/2018
6+
# Generated on: 7/3/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '4.9.0'
15+
ModuleVersion = '4.10.0'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -191,8 +191,8 @@ CmdletsToExport = 'Get-AzureRmSqlDatabaseTransparentDataEncryption',
191191
'Set-AzureRmSqlServerDnsAlias',
192192
'New-AzureRmSqlDatabaseRestorePoint',
193193
'Remove-AzureRmSqlDatabaseRestorePoint',
194-
'Stop-AzureRmSqlElasticPoolActivity',
195-
'Add-AzureRmSqlServerTransparentDataEncryptionCertificate',
194+
'Stop-AzureRmSqlElasticPoolActivity',
195+
'Add-AzureRmSqlServerTransparentDataEncryptionCertificate',
196196
'Add-AzureRmSqlManagedInstanceTransparentDataEncryptionCertificate'
197197

198198
# Variables to export from this module
@@ -233,9 +233,9 @@ PrivateData = @{
233233
# IconUri = ''
234234

235235
# ReleaseNotes of this module
236-
ReleaseNotes = '* Clarified User-Defined Restore Points for SQLDW in New-AzureRmSqlDatabaseRestorePoint help
237-
* Fixed formatting of OutputType in help files
238-
* Updated documentation of -ComputeGeneration parameter in several cmdlets'
236+
ReleaseNotes = '* Adding new Cmdlets for Management.Sql to allow customers to add TDE Certificate to Sql Server instance or a Managed Instance
237+
- Add-AzureRmSqlServerTransparentDataEncryptionCertificate
238+
- Add-AzureRmSqlManagedInstanceTransparentDataEncryptionCertificate'
239239

240240
# Prerelease string of this module
241241
# Prerelease = ''

src/ResourceManager/Sql/Commands.Sql/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
22+
## Version 4.10.0
2123
* Adding new Cmdlets for Management.Sql to allow customers to add TDE Certificate to Sql Server instance or a Managed Instance
2224
- Add-AzureRmSqlServerTransparentDataEncryptionCertificate
2325
- Add-AzureRmSqlManagedInstanceTransparentDataEncryptionCertificate

src/ResourceManager/Sql/Commands.Sql/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646

47-
[assembly: AssemblyVersion("4.9.0")]
48-
[assembly: AssemblyFileVersion("4.9.0")]
47+
[assembly: AssemblyVersion("4.10.0")]
48+
[assembly: AssemblyFileVersion("4.10.0")]
4949
#if SIGN
5050
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Resources.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5151
#else

tools/AzureRM/AzureRM.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.3.2';
9898
@{ModuleName = 'AzureRM.Scheduler'; RequiredVersion = '0.16.6'; },
9999
@{ModuleName = 'AzureRM.ServiceBus'; RequiredVersion = '0.6.6'; },
100100
@{ModuleName = 'AzureRM.ServiceFabric'; RequiredVersion = '0.3.7'; },
101-
@{ModuleName = 'AzureRM.Sql'; RequiredVersion = '4.9.0'; },
101+
@{ModuleName = 'AzureRM.Sql'; RequiredVersion = '4.10.0'; },
102102
@{ModuleName = 'AzureRM.Storage'; RequiredVersion = '5.0.0'; },
103103
@{ModuleName = 'AzureRM.StreamAnalytics'; RequiredVersion = '4.0.6'; },
104104
@{ModuleName = 'AzureRM.Tags'; RequiredVersion = '4.0.3'; },

0 commit comments

Comments
 (0)