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

Adding Standard_Microsoft sku in CDN pricing tier #4713

Closed
wants to merge 8 commits into from
Closed

Adding Standard_Microsoft sku in CDN pricing tier #4713

wants to merge 8 commits into from

Conversation

hytao
Copy link
Contributor

@hytao hytao commented Aug 28, 2018 •
edited
Loading

Description

Regenerating CDN SDK based on latest swagger spec.
Azure/azure-rest-api-specs#3628

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

General Guidelines

  • [x ] Title of the pull request is clear and informative.
  • [ x] 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

  • [ x] Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • [x ] 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.
  • [ x] 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.
  • [ x] The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

dsgouda
dsgouda suggested changes Aug 29, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a couple of comments

src/SDKs/Cdn/Management.Cdn/Properties/AssemblyInfo.cs Outdated
@@ -8,8 +8,8 @@
[assembly: AssemblyTitle("Microsoft Azure CDN Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure CDN.")]

[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.1.0")]
[assembly: AssemblyVersion("4.0.1.0")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not modify the AssemblyVersion here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes reverted

src/SDKs/Cdn/Management.Cdn/Microsoft.Azure.Management.Cdn.csproj Show resolved Hide resolved
dsgouda
dsgouda suggested changes Aug 29, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this code generated using generate.ps1?
Changes to a .txt log file must also be generated please commit those changes

@dsgouda
Copy link
Contributor

dsgouda commented Aug 30, 2018

@azuresdkci Retest this please

@hytao
Copy link
Contributor Author

hytao commented Aug 30, 2018

Logs added.
Thanks

@hytao
Copy link
Contributor Author

hytao commented Aug 31, 2018

@dsgouda is it the log file you were looking for?

dsgouda
dsgouda approved these changes Aug 31, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks great, please squash commits into a single commit and we should be good to merge

Hanyun Tao added 2 commits August 31, 2018 14:31
Adding Standard_Microsoft in pricing tier
7498f74 
update version

address comments

log

Dev auth lib (#4677)

* bringing back DeviceAuth for .NETCore

* adding more tests for auth library

[Do Not Merge] RecoveryServices.Backup update for latest release (#4613)

* SDK 1806 update

* Incrementing the version

* Revert "SDK 1806 update"

This reverts commit 0519fee.

* Revert "Incrementing the version"

This reverts commit 49135af.

* RecoveryServices.Backup release

* Recovery services backup 1807

Generated using Generate.ps1

* incorporating feedback

[Monitor] Fixing incidents #3585 [Monitor] Breaking change found in AutoScale spec (Swagger spec) and #3293 [Monitor] Add serviceBusRuleId to the DiagnosticSettings resource (Swagger spec) (#4655)

bumping CR version to be used within SdkCommon scope (#4682)

* bumping CR version to be used within SdkCommon scope

* fixing test asserts

Test fx (#4685)

* Adding release notes. Fixing versions for dependencies

* adding dependencies for intrim release

[Cognitive Services] Update endpoint template for Content Moderator SDK.

Fix issue of metadata.

Updating references for references used among SdkCommon scope. Updating assemblyInfo. Updating build file for ubuntu (#4693)

Fix ContentModerator Release Notes.

Support database sensitivity labels

Added generated clients in addition to corresponding tests.

Increase client side timeout for some server requests

  - Requests whose default timeouts are 2m should have a client side timeout
    longer than 2m.

Stop doing hacky %5C/%2F handling in shared key auth

  - The underlying server bug/behavior which caused us to need to do this has been fixed
    in the latest REST API version.

Fix bug where sharedkey auth fails in netcoreapp 2.1

  - This is due to https://github.com/dotnet/corefx/issues/31172

Add CopyNodeFileContentToStream and CopyNodeFileContentToString

  - This allows callers to bypass a superfluous GetFileProperties call
    if they're really interested in performance when downloading files.

Add default retry policy on BatchClient

Correct FileConventions error string

Remove OpenAsync since we don't make any async calls

  - Nor do we plan to.

Fix confusing ResizeErrors documentation

Regenerate code based on 2018-08-01.7.0 Swagger spec

  - Update SDK version to 9.0.
  - Update changelog.

Fix tests

Update AzSdk.RP.props

Re-generated Network for August release

Updated release notes

Remove LoadBalancerOutboundNatRule's test

Update Network SDK version

Updated Network SDK

Updating repository to use the latest released test tools (#4695)

* Updating repository to use the latest released test tools

* removing CR as well as TestFx version specified in the test projects

* disabling botservice tests

* Fixing keyvault test projects build issues

Regenerated EventGrid DataPlane SDK to account for recent Swagger updates from ARM and IotHub teams.

Added unit tests corresponding to new event types (IoT and ARM)

Updated version and package release notes.

Updating major version of the package per PR feedback.

Regenerate Policy SDK

Update resource manager metadata

Update version and release notes

Re-generated with latest metadata generation script

updating bootstrapper with support for LKG

 Skipping setting user agent info if it is empty  (#4686)

* Skipping setting user agent info if it is empty

* fixing assemblyinfo

Treating warnings as errors for A projects (#4694)

Generating SDK for websites (#4688)

* Generating SDK for websites

* Adding the generated files

* Undo NuGet.config changes & updating version

* Updating to use the latest Microsoft.Rest.ClientRuntime.Azure & re-enabling a test

* Version update

* Updating with the swagger update for deletedSites

Updated for 2018-Preview

Added generate.ps1, changes to support Azure Disk Encryption & Accelerated Networking are included.

updating CR for the repo. Fixing failing tests (#4714)
Merge branch 'psSdkJson6' of https://github.com/hytao/azure-sdk-for-net…
d0c841c 
… into psSdkJson6
@hytao
Copy link
Contributor Author

hytao commented Aug 31, 2018

@dsgouda I'm not sure how to do this on GitHub. Could you help?

@dsgouda
Copy link
Contributor

dsgouda commented Aug 31, 2018

The easiest way I can think of is:

  1. Rename your local branch to something else and copy over all the files you changed here to a temp directory
  2. Checkout psSdkJson6 on your local repo, pull down latest upstream changes and create a new branch with the same name as this, copy over the files from temp directory here, commit the changes and force push here

@hytao
Copy link
Contributor Author

hytao commented Aug 31, 2018

Hi, @dsgouda , It appears that I was working on branch psSdkJson6 and I am not sure how to make it clean again.
Do you think it is a good idea to restart from the very beginning and create a new PR?

@dsgouda
Copy link
Contributor

dsgouda commented Aug 31, 2018

That would be the safest bet. Please make sure you save your changes somewhere while doing so

@hytao
Copy link
Contributor Author

hytao commented Aug 31, 2018

@dsgouda, I created a new PR #4730.

Thanks

@hytao hytao closed this Aug 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsgouda dsgouda dsgouda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hytao @dsgouda @shahabhijeet