[do not merge before 4118] Adding changes to support Private DNS Public Preview #4109

muwaqar · 2018-03-05T20:34:30Z

Description

Swagger (REST spec) PR link: Azure/azure-rest-api-specs#2587

This checklist is used to make sure that common guidelines for a pull request are followed.

Please add REST spec PR link to the SDK PR
I have read the contribution guidelines.
The pull request does not introduce breaking changes.

General Guidelines

Title of the pull request is clear and informative.
There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

Pull request includes test coverage for the included changes.

SDK Generation Guidelines

If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as the commitid of your swagger spec or link to the swagger spec, used to generate the code.
The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

dsgouda

Please generate the code using generate.cmd this should generate a .txt file, please commit that file.
If generate.cmd does not seem to generate this file, please pull down the latest changes and try again.

muwaqar · 2018-03-05T22:06:42Z

Please do NOT merge the pull request until the corresponding Swagger changes have been merged and our relevant services have been updated.

…-dns-public-preview).

…7-10-01 API version.

dsgouda · 2018-03-07T22:24:44Z

@azuresdkci retest

shahabhijeet · 2018-03-07T22:27:15Z

@azuresdkci retest this please

shahabhijeet · 2018-03-10T02:34:41Z

src/SDKs/Dns/Dns.Tests/Dns.Tests.csproj

    <ProjectReference Include="..\Management.Dns\Microsoft.Azure.Management.Dns.csproj" />
  </ItemGroup>
-  
+


@muwaqar remove empty lines

shahabhijeet · 2018-03-10T02:35:15Z

src/SDKs/Dns/Dns.Tests/Helpers/ResourceGroupHelpers.cs

 using Xunit;
-using Microsoft.Azure.Management.Dns.Models;
+using SubResource = Microsoft.Azure.Management.Dns.Models.SubResource;


@muwaqar sort and remove unused usings (if applicable)

shahabhijeet · 2018-03-10T02:36:34Z

src/SDKs/_metadata/dns_resource-manager.txt

-Branch:      current
-Commit:      765c5a6807e3a093868bff793ec3e8ea0cdabe75
+GitHub user: owolabi2
+Branch:      koowolab/private-dns-public-preview


@muwaqar this SDK will need to be generated from master of spec repo.

Will do once our Swagger PR (Azure/azure-rest-api-specs#2587) is approved.

shahabhijeet · 2018-03-10T02:37:06Z

src/SDKs/Dns/Management.Dns/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@
 [assembly: AssemblyTitle("Microsoft Azure DNS Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure DNS Resources.")]
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]


@muwaqar why go to 2.2 instead of 2.1?

2.1 is taken by 2017-10-01 API version (changes for which should be in psSdkJson6 branch already).

shahabhijeet · 2018-03-10T02:37:23Z

src/SDKs/Dns/Management.Dns/Microsoft.Azure.Management.Dns.csproj

@@ -6,12 +6,12 @@
 	<PropertyGroup>
 		<PackageId>Microsoft.Azure.Management.Dns</PackageId>
 		<Description>Provides management capabilities for Azure Dns.</Description>
-		<Version>2.0.0-preview</Version>
+		<Version>2.2.0-preview</Version>


@muwaqar why move to 2.2 instead of 2.1?

2.1 is taken by 2017-10-01 API version (changes for which should be in psSdkJson6 branch already).

Don't know why GitHub is showing 2.0.0-preview (as before). The latest file (https://github.com/Azure/azure-sdk-for-net/blob/psSdkJson6/src/SDKs/Dns/Management.Dns/Microsoft.Azure.Management.Dns.csproj) has 2.1.0-preview version.

shahabhijeet · 2018-03-10T02:40:03Z

@muwaqar I see another PR for DNS #4118
Are these both PR should be merged at the same time?

dsgouda

Looks good for the most part bar a minor change

dsgouda · 2018-03-13T20:26:33Z

src/SDKs/Dns/Management.Dns/Properties/AssemblyInfo.cs

@@ -6,8 +6,8 @@

 [assembly: AssemblyTitle("Microsoft Azure DNS Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure DNS Resources.")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]


Please do not update the AssemblyVersion here.

dsgouda

LGTM

Muhammad Waqar added 6 commits March 5, 2018 09:05

Generating SDK based on 2018-03-01-preview version.

bb1ef9b

Deleting old session records.

170e123

Adding zone scenario tests for Private DNS.

263e2bb

Modifying RecordSet tests for Private zones.

f191ff8

Including session records again.

e97cfa4

Bumping up the version.

959e2fc

dsgouda suggested changes Mar 5, 2018

View reviewed changes

dsgouda added the Changes Requested label Mar 5, 2018

Re-generating the SDK based from generate.cmd (fork: owolabi2/private…

6cdcd44

…-dns-public-preview).

dsgouda added the Do Not Merge label Mar 5, 2018

dsgouda self-assigned this Mar 5, 2018

dsgouda added the spec-not-merged label Mar 5, 2018

Bumping up the version again to 2.2.0 since 2.1.0 will be used by 201…

ea7fb48

…7-10-01 API version.

This was referenced Mar 7, 2018

Adding support for Private DNS zones Public Preview Azure/azure-powershell#5701

Merged

[DNM] Adding support for Private DNS Public Preview Azure/azure-cli#5763

Merged

Re-generating the SDK making the ZoneType optional.

3678f29

shahabhijeet suggested changes Mar 10, 2018

View reviewed changes

shahabhijeet mentioned this pull request Mar 10, 2018

Update DNS SDK for 2017-10-01 API Version #4118

Merged

9 tasks

shahabhijeet changed the title ~~Adding changes to support Private DNS Public Preview~~ [do not merge before 4118] Adding changes to support Private DNS Public Preview Mar 10, 2018

Muhammad Waqar added 7 commits March 12, 2018 16:55

Including changes for 2017-10-01 API version.

afc7b3d

Re-recording all tests.

95fbc7f

Minor refactoring.

b777567

Resolving merge conflicts.

5582818

Fixing duplicated lines.

6916503

Generating SDK against merged Swagger.

bdac517

capitalizing DNS in csproj

0138f9a

dsgouda suggested changes Mar 13, 2018

View reviewed changes

dsgouda removed the spec-not-merged label Mar 13, 2018

Downgrading assemblyversion to 2.1.0.0

0505c17

dsgouda approved these changes Mar 14, 2018

View reviewed changes

shahabhijeet approved these changes Mar 14, 2018

View reviewed changes

dsgouda removed Changes Requested Do Not Merge labels Mar 14, 2018

dsgouda merged commit 987dcaf into Azure:psSdkJson6 Mar 14, 2018

muwaqar mentioned this pull request Mar 14, 2018

Generating DNS client from latest Swagger changes #4130

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[do not merge before 4118] Adding changes to support Private DNS Public Preview #4109

[do not merge before 4118] Adding changes to support Private DNS Public Preview #4109

muwaqar commented Mar 5, 2018 •

edited

Loading

dsgouda left a comment

muwaqar commented Mar 5, 2018

dsgouda commented Mar 7, 2018

shahabhijeet commented Mar 7, 2018

shahabhijeet Mar 10, 2018

shahabhijeet Mar 10, 2018

shahabhijeet Mar 10, 2018

muwaqar Mar 13, 2018

shahabhijeet Mar 10, 2018

muwaqar Mar 12, 2018

shahabhijeet Mar 10, 2018

muwaqar Mar 12, 2018

muwaqar Mar 13, 2018

shahabhijeet commented Mar 10, 2018 •

edited

Loading

dsgouda left a comment •

edited

Loading

dsgouda Mar 13, 2018

dsgouda left a comment

		<ProjectReference Include="..\Management.Dns\Microsoft.Azure.Management.Dns.csproj" />
		</ItemGroup>

[do not merge before 4118] Adding changes to support Private DNS Public Preview #4109

[do not merge before 4118] Adding changes to support Private DNS Public Preview #4109

Conversation

muwaqar commented Mar 5, 2018 • edited Loading

Description

dsgouda left a comment

Choose a reason for hiding this comment

muwaqar commented Mar 5, 2018

dsgouda commented Mar 7, 2018

shahabhijeet commented Mar 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shahabhijeet commented Mar 10, 2018 • edited Loading

dsgouda left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dsgouda left a comment

Choose a reason for hiding this comment

muwaqar commented Mar 5, 2018 •

edited

Loading

shahabhijeet commented Mar 10, 2018 •

edited

Loading

dsgouda left a comment •

edited

Loading