Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Newtonsoft] Publish version of SQL for preview branch #4972

Merged
merged 4 commits into from Nov 2, 2018
Merged

[Newtonsoft] Publish version of SQL for preview branch #4972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abd9909
update version of sql
Oct 30, 2018
0f2dfd0
upgrade newtonsoft
Oct 30, 2018
d0fe7c8
fix test
Oct 30, 2018
521afa4
skip tests
Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AzSdk.reference.props
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="System.Net.Http" Version="4.3.0"/>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
Expand Down
11 changes: 2 additions & 9 deletions src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj
View file
Open in desktop
Expand Up @@ -7,16 +7,9 @@
<PackageId>Microsoft.Azure.Management.Sql</PackageId>
<Description>Azure SQL Management SDK library</Description>
<AssemblyName>Microsoft.Azure.Management.Sql</AssemblyName>
<Version>1.20.1-preview</Version>
<Version>1.20.2-preview</Version>
<PackageTags>Microsoft Azure SQL Management;SQL;SQL Management;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
New features:
- Added support for Managed Instance keys and encryption protectors.
- Added support for DatabaseVulnerabilityAssessment.StorageAccountAccessKey, which causes DatabaseVulnerabilityAssessment.StorageContainerSasKey to no longer be a required property.
- Added support for Managed Instance DnsZone, DnsZonePartner and Collation properties
]]>
</PackageReleaseNotes>
<PackageReleaseNotes>Taking dependency on 10.0.3 version of Newtonsoft nuget package.</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs
View file
Open in desktop
Expand Up @@ -22,5 +22,5 @@
[assembly: AssemblyTitle("Microsoft Azure SQL Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure SQL.")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.20.1.0")]
[assembly: AssemblyFileVersion("1.20.2.0")]

1 change: 1 addition & 0 deletions src/SDKs/SqlManagement/Sql-RerecordWithNewKeyVault.playlist
View file
Open in desktop
@@ -0,0 +1 @@
<Playlist Version="1.0"><Add Test="Sql.Tests.EncryptionProtectorScenarioTests.TestUpdateEncryptionProtector" /><Add Test="Sql.Tests.ServerKeyScenarioTests.TestCreateUpdateDropServerKey" /></Playlist>
2 changes: 1 addition & 1 deletion src/SDKs/SqlManagement/Sql.Tests/EncryptionProtectorScenarioTests.cs
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ namespace Sql.Tests
{
public class EncryptionProtectorScenarioTests
{
[Fact]
[Fact(Skip = "Rerecord with new KeyVault dependency")]
public void TestUpdateEncryptionProtector()
{
using (SqlManagementTestContext context = new SqlManagementTestContext(this))
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/SqlManagement/Sql.Tests/ServerKeyScenarioTests.cs
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ namespace Sql.Tests
{
public class ServerKeyScenarioTests
{
[Fact]
[Fact(Skip = "Rerecord with new KeyVault dependency")]
public void TestCreateUpdateDropServerKey()
{
using (SqlManagementTestContext context = new SqlManagementTestContext(this))
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/SqlManagement/Sql.Tests/Sql.Tests.csproj
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
</PropertyGroup>-->
<ItemGroup>
<PackageReference Include="Microsoft.Azure.KeyVault" Version="2.0.6" />
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.2.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="14.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.0-preview" />
Expand Down