Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) #3909

felixwa · 2017-12-01T09:20:21Z

Description

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.

…dkJson6

Regenerate using the latest AutoRest Reversion to 2.1

shahabhijeet

Please link the spec PR.
Also use generate.cmd to generated sdk, this will create a meta data file (.txt)

shahabhijeet · 2017-12-01T10:04:56Z

.../management/Management.CognitiveServices/Microsoft.Azure.Management.CognitiveServices.csproj

 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
 	</PropertyGroup>
+	<ItemGroup>
+	  <Compile Remove="Properties\AssemblyInfo.cs" />


@felixwa please remove from line 17 to 19
also remove line 24 to 27

@shahabhijeet , I'm seeing CS0579 if AssemblyInfo.cs is included.

obj\Debug\netstandard1.4\Microsoft.Azure.Management.CognitiveServices.AssemblyInfo.cs(14,12,14,54): error CS0579: Duplicate 'System.Reflection.AssemblyCompanyAttribute' attribute

Can you please tell me how to mitigate this error? Should I add GenerateAssemblyInfo = false?

I talked to @DavidLiCIG and he said we can remove this AssemblyInfo.cs file so I removed it.

shahabhijeet · 2017-12-01T10:05:29Z

src/SDKs/CognitiveServices/management/CognitiveServices.Tests/CognitiveServices.Tests.csproj

@@ -10,6 +10,9 @@
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
  </PropertyGroup>
+  <ItemGroup>


@felixwa please remove line 13 to 15 and line 35 to 38

Remove and also removed AssemblyInfo.cs

felixwa · 2017-12-04T05:57:42Z

Spec PR: Azure/azure-rest-api-specs#1981

felixwa · 2017-12-04T06:12:52Z

The changes were generated generate.cmd. I also fixed a folder structure issue in generate.cmd in this PR.
A remaining issue with generate.cmd is that now it generates the folder under SDKs\CognitiveServices folder but it should be SDKs\CognitiveServices\management folder. @shahabhijeet if you know how to fix this I can also do that in this PR.
I know how to fix it now. Azure/azure-rest-api-specs#2103

Remove AssemblyInfo.cs file

Remove Properties folder in test proj

shahabhijeet

Missing meta data file when generated using generate.cmd.
Any reason AssemblyInfo.cs was deleted.

shahabhijeet · 2017-12-06T18:46:02Z

.../management/Management.CognitiveServices/Microsoft.Azure.Management.CognitiveServices.csproj

 		<AssemblyName>Microsoft.Azure.Management.CognitiveServices</AssemblyName>
 		<PackageTags>Microsoft Azure Cognitive Services management;Cognitive Services;Cognitive Services management</PackageTags>
-		<PackageReleaseNotes/>
+		<PackageReleaseNotes />


Can you add package release notes to specify what is new in this release.

shahabhijeet · 2017-12-06T18:46:49Z

.../management/Management.CognitiveServices/Microsoft.Azure.Management.CognitiveServices.csproj

 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Content Include="notice.txt" />
 	</ItemGroup>
+
+	<ItemGroup>


@felixwa please remove this item group as it's not needed to specify explicitly about directory structure.
Makes the project xml unnecessarily large.

1. add metradata file. 2. regenerate SDK by fixing folder structure PR.

felixwa · 2017-12-07T03:50:07Z

src/SDKs/_metadata/cognitiveservices_resource-manager.txt

+2017-12-07 03:31:20 UTC
+
+1) azure-rest-api-specs repository information
+GitHub user: felixwa


@shahabhijeet , I know this is generated by my own fork. Please take a look at this PR:Azure/azure-rest-api-specs#2103. After that PR is approved and merged I will regenerate.

felixwa · 2017-12-07T03:55:33Z

@shahabhijeet , the reason I removed AssemblyInfo.cs is because it generates compiler error CS0579

obj\Debug\netstandard1.4\Microsoft.Azure.Management.CognitiveServices.AssemblyInfo.cs(14,12,14,54): error CS0579: Duplicate 'System.Reflection.AssemblyCompanyAttribute' attribute

Add PackageReleaseNotes

shahabhijeet · 2017-12-08T04:25:01Z

@felixwa if you simply do
msbuild build.proj it will update your build tools and then if you try to rebuild it should not give you that error.
if it still does, let me know and I would like to see it and will fix it if required. But we cannot ship sdk without AssemblyInfo
Plus resolve the below conflicts

This reverts commit 8f5f8a9.

Run msbuild to update build tools

…-net into psSdkJson6

Revert CognitiveServices.Tests.csproj

Resolve conflicts.

Revert indents in CogntiiveServices.csproj so that change scope looks smaller.

…-sdk-for-net into Regenearte-SDK-2.1

Correct previous commit

Correct indents

felixwa · 2017-12-11T04:31:43Z

@shahabhijeet , now AssemblyInfo.cs is back and conflict is resolved. I also changed AssemblyVersion and AssemblyFileVersion to 2.1. Please continue your review.

Change Assembly version to 2.1.0.0 Make ReleaseNotes one line.

Remove AzSdk.RP.props file as seems like it should be not commit

shahabhijeet

The Spec PR is merged. Please do the following:

Pull latest from upstream
Regenerate your SDK
Msbuild build.proj to get the latest build tools
Build you sdk from command line or IDE
Create/update this PR.

shahabhijeet · 2017-12-12T19:31:25Z

src/SDKs/CognitiveServices/management/Management.CognitiveServices/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyTitle("Microsoft Azure Cognitive Services Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure Cognitive Services management functions for managing Microsoft Azure Cognitive Services accounts.")]

-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]


@felixwa please do not update AssemblyVersion when you change the minor version of AssemblyFileVersion.

@shahabhijeet , please note there is a breaking change here (provisionState is changed to string from enum), why do not increase AssemblyVersion in this case?

Regenerated against latest spec.

Regenerate SDK again as shahabhijeet requested

Bump version to 3.0.0.0 as there is a breaking change

Add AzSdk.RP.props

felixwa added 2 commits December 1, 2017 14:47

Merge remote-tracking branch 'refs/remotes/Azure/psSdkJson6' into psS…

cb0dfce

…dkJson6

Regenerate using the latest AutoRest

b6adccc

Regenerate using the latest AutoRest Reversion to 2.1

felixwa changed the title ~~Regenearte sdk 2.1~~ Regenearte Cognitive Services sdk with latest Spec and AutoRest (targeting release as 2.1) Dec 1, 2017

felixwa changed the title ~~Regenearte Cognitive Services sdk with latest Spec and AutoRest (targeting release as 2.1)~~ Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) Dec 1, 2017

shahabhijeet suggested changes Dec 1, 2017

View reviewed changes

shahabhijeet added the Changes Requested label Dec 1, 2017

felixwa added 2 commits December 6, 2017 18:24

Remove AssemblyInfo.cs file

8f5f8a9

Remove AssemblyInfo.cs file

Remove Properties folder in test proj

d561d47

Remove Properties folder in test proj

shahabhijeet suggested changes Dec 6, 2017

View reviewed changes

Resolve some review comments

10ae273

1. add metradata file. 2. regenerate SDK by fixing folder structure PR.

felixwa commented Dec 7, 2017

View reviewed changes

Add PackageReleaseNotes

3d4e3a1

Add PackageReleaseNotes

shahabhijeet added the Merge Conflicts label Dec 8, 2017

felixwa added 13 commits December 11, 2017 11:23

Revert "Remove AssemblyInfo.cs file"

660d61a

This reverts commit 8f5f8a9.

Run msbuild to update build tools

ed30e6c

Run msbuild to update build tools

Merge branch 'psSdkJson6' of https://github.com/felixwa/azure-sdk-for…

772c991

…-net into psSdkJson6

Merge branch 'psSdkJson6' into Regenearte-SDK-2.1

eb20f0b

Revert CognitiveServices.Tests.csproj

d99299c

Revert CognitiveServices.Tests.csproj

Resolve conflicts.

923a9e4

Resolve conflicts.

Merge branch 'psSdkJson6' into Regenearte-SDK-2.1

89c151d

Merge branch 'psSdkJson6' into Regenearte-SDK-2.1

e599916

Revert indents in CogntiiveServices.csproj

f1da037

Revert indents in CogntiiveServices.csproj so that change scope looks smaller.

Merge branch 'Regenearte-SDK-2.1' of https://github.com/felixwa/azure…

14f315e

…-sdk-for-net into Regenearte-SDK-2.1

Correct previous commit

056c0d1

Correct previous commit

Correct indents

8ee1eac

Correct indents

Correct indents

2d45fe8

Correct indents

felixwa added 2 commits December 11, 2017 12:49

Change Assembly version

af19f45

Change Assembly version to 2.1.0.0 Make ReleaseNotes one line.

Remove AzSdk.RP.props file

03dbd36

Remove AzSdk.RP.props file as seems like it should be not commit

shahabhijeet suggested changes Dec 12, 2017

View reviewed changes

shahabhijeet removed the Merge Conflicts label Dec 12, 2017

felixwa and others added 5 commits December 13, 2017 11:47

Regenerated against latest spec.

42a1d5b

Regenerated against latest spec.

Merge branch 'psSdkJson6' into Regenearte-SDK-2.1

91a5ee0

Regenerate SDK again as shahabhijeet requested

ef5c41d

Regenerate SDK again as shahabhijeet requested

Bump version to 3.0.0.0 as there is a breaking change

bf14abf

Bump version to 3.0.0.0 as there is a breaking change

Add AzSdk.RP.props

9a4ec4f

Add AzSdk.RP.props

shahabhijeet approved these changes Dec 19, 2017

View reviewed changes

shahabhijeet merged commit fd9782c into Azure:psSdkJson6 Dec 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) #3909

Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) #3909

felixwa commented Dec 1, 2017 •

edited

Loading

shahabhijeet left a comment

shahabhijeet Dec 1, 2017

felixwa Dec 4, 2017 •

edited

Loading

felixwa Dec 6, 2017

shahabhijeet Dec 1, 2017

felixwa Dec 6, 2017

felixwa commented Dec 4, 2017

felixwa commented Dec 4, 2017 •

edited

Loading

shahabhijeet left a comment

shahabhijeet Dec 6, 2017

shahabhijeet Dec 6, 2017

felixwa Dec 7, 2017

felixwa commented Dec 7, 2017

shahabhijeet commented Dec 8, 2017 •

edited

Loading

felixwa commented Dec 11, 2017 •

edited

Loading

shahabhijeet left a comment

shahabhijeet Dec 12, 2017

felixwa Dec 13, 2017

Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) #3909

Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1) #3909

Conversation

felixwa commented Dec 1, 2017 • edited Loading

Description

shahabhijeet left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felixwa Dec 4, 2017 • edited Loading

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

felixwa commented Dec 4, 2017

felixwa commented Dec 4, 2017 • edited Loading

shahabhijeet left a 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

felixwa commented Dec 7, 2017

shahabhijeet commented Dec 8, 2017 • edited Loading

felixwa commented Dec 11, 2017 • edited Loading

shahabhijeet left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felixwa commented Dec 1, 2017 •

edited

Loading

felixwa Dec 4, 2017 •

edited

Loading

felixwa commented Dec 4, 2017 •

edited

Loading

shahabhijeet commented Dec 8, 2017 •

edited

Loading

felixwa commented Dec 11, 2017 •

edited

Loading