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.

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

[ACR] Update SDK to 2017-10-01 version #3778

Merged
merged 3 commits into from
Oct 20, 2017
Merged

[ACR] Update SDK to 2017-10-01 version #3778

merged 3 commits into from
Oct 20, 2017

Conversation

djyou
Copy link
Member

@djyou djyou commented Oct 12, 2017

Generated from swagger spec https://github.com/Azure/azure-rest-api-specs/blob/current/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/2017-10-01/containerregistry.json

  • Added support for managed registries that can be created with Basic, Standard, Premium SKU.
  • Bring your own storage registries can still be created with Classic SKU.
  • Added support for webhooks and replications.

Description


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

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.

@djyou
Copy link
Member Author

djyou commented Oct 12, 2017

/cc @sajayantony

@shahabhijeet
Copy link
Member

@azuresdkci test this please

@@ -12,9 +12,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[5.0.2-preview,6.0)" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[6.0.0-preview,7.0)" />
Copy link
Member

Choose a reason for hiding this comment

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

@djyou please add reference to the latest version of resource manager nuget package and re-record all your test using the latest version of resource manager.

using System;
using System.Linq;
using System.Collections.Generic;
using Microsoft.Azure.Management.ContainerRegistry;
Copy link
Member

Choose a reason for hiding this comment

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

@djyou sort and remove unused usings

Copy link
Member Author

@djyou djyou Oct 13, 2017

Choose a reason for hiding this comment

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

This is already sorted and cleaned as per VS2017, or is there a different schema SDK uses?

@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
<PropertyGroup>
<Description>Microsoft Azure Container Registry Management Library</Description>
<VersionPrefix>1.1.0-preview</VersionPrefix>
<VersionPrefix>2.0.2</VersionPrefix>
<AssemblyName>Microsoft.Azure.Management.ContainerRegistry</AssemblyName>
<!--<Authors>Microsoft</Authors>
Copy link
Member

Choose a reason for hiding this comment

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

@djyou remove commented code
Model your csproj file using SDKs\BatchAI csproj
Also add PackageReleaseNotes

<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[5.0.2-preview,6.0)" />

<!--<PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="1.2.0-preview" />-->
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[7.0.0-preview,7.0)" />
Copy link
Member

Choose a reason for hiding this comment

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

@djyou you should be using latest version of Resource Manager 1.6.0 at least or the latests version to record all your tests.
So sorry to remind you in my earlier iteration of code review.
You are still using 1.1.0 version which is very old and should not be used to create your resources.

Copy link
Member Author

Choose a reason for hiding this comment

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

I was confused with the comment actually. Did you mean we should add reference to Resource Manager 1.6.0 because currently it's not in csproj file?

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.2.0")]
Copy link
Member

Choose a reason for hiding this comment

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

@djyou any reason you are going from 1.2 to 2.0.2?
Why 2.0.2 and not 2.0.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

We had generated private release packages with 2.0.0 and 2.0.1 so this one will jump to 2.0.2.

Copy link
Member

Choose a reason for hiding this comment

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

@djyou if you create private release package for 2.0.0 and 2.0.1 where is the code for it?
Don't you have to merge the code for it?

Copy link
Member Author

Choose a reason for hiding this comment

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

It was from the previous closed PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

My understanding from the SDK team is that the private SDK package can be generated from any fork or branch and used internally or testing. Versions 2.0.0 and 2.0.1 were already used so a version increment is natural here.

@djyou
Copy link
Member Author

djyou commented Oct 16, 2017

@shahabhijeet Can you please clarify the above issues so we can get them fixed and have this SDK merged and released? Thanks.

Address PR review feedback
@shahabhijeet shahabhijeet merged commit bf96f51 into Azure:psSdkJson6 Oct 20, 2017
shahabhijeet added a commit that referenced this pull request Nov 2, 2017
* Regenerate SDK for new added api key management swagger spec (#3767)

* Generate .NET SDK for application insights

* update assembly version

* address code review feedback

* address code review feedback

* regenerate sdk for adding management api keys functions

* remove local used LaunchSettings.json file

* generate from the pulic swagger

* increase version in csproj file

* Update Batch changelog to have a clearer format (#3775)

* Removing build tools outside of branches (#3780)

* Moving old files which are not used anymore to legacy directory

* Separate build tools from branch. Moving forward build tools will be downloaded from a central location, this helps in propogating build changes to any branch dynamically. After this change build process on a new machine or fresh install will be a two step process. First download the build tools by executing msbuild build.proj and once it finishes, then execute whatever target you need to do e.g. msbuild build.proj /t:RunTests /p:Scope=SDKs\Compute. After downloading all build related assets will be downloaded under <root>\tools\SdkBuildTools. Moving bunch of legacy code to legacy directory. Removing build tasks out of this branch, currently being moved to legacy directory

* Update README.md

Updating readme to document recent build changes that were done to extract build tools out of main branch.

* Adding data factory CRUD scenario test (#3774)

* This is the first batch of scenario tests for the ADF V2 SDK.
  * Partially addresses #3726; more tests need to be added

* Update Batch supporting assemblies (#3794)

* [ADLA] - Update changelog for version 3.0.2 (#3792)

* Merge from private Networking (#3771)

* Regenerated Networking SDK on 2017-09-01, private

* Expose new operation for VpnDeviceConfiguration for Vpn Gateways

* Adding AzureReachabilityReport and AvailableProvidersList APIs + tests

* Updating version of Network SDK

* Disabling tests for AzureReachabilityReport and AvailableProvidersList APIs

* Updated version

* Caa record support in Azure DNS (#3785)

* upgrade .net.test.sk project to stable version

* support for CAA records

* changing assembly file version to reflect nuget version

* update swagger from public repo

* addressing code review comments

* bumping up assembly verson to 2.0.0.0

* [ADLA - ADLS] - [HOTFIX] - Update changelog (#3802)

* [ADLA] - Update changelog for version 3.0.2

* [ADLA] - Update changelog

* [ADLS] - Update changelog

* Update changelog

* 3.0.1 for ADLA was never published to nuget

* 2.2.1 for ADLS was never published to nuget

* Adding .NET SDK changes for Server DNS Aliasing (#3803)

* Auto generated files for .NET SDK for Server DNS Aliasing. Also contains removing unused declarations from bunch of files. Everything generated automatically

* Adding tests for server dns aliasing and their recording

* Fixing sql_resource_manager.txt

* Updating new version of SDK in AssemblyInfo.cs and csproj file

* Small cosmetic changes to address Jared

* Revert "Small cosmetic changes to address Jared"

This reverts commit 5a5e426.

* Reverting version change in project and AssemblyInfo files; addressing small change requests from Jared in pull request

* [ACR] Update SDK to 2017-10-01 version (#3778)

* Update ACR SDK to 2017-10-01 version

* Update csproj, re-record tests

* Address PR review feedback

Address PR review feedback

* Fix issue with missing Unit enumeration values, fix documentation issues, improved tests for multi-dim metrics API (#3809)

* [Monitor] Fixing doc issues, adding two values to the metric unit enumeration, generating metadata files

* Increasing version number due to a bug fix and documentation updates

* [Monitor] Adding multi-dimensional metrics tests

* Re-generate SDKs/Resource (#3793)

* Updated Network SDK version (#3814)

* Added Zone Redundant Property To Database, Elastic Pool and Edition Capability (#3800)

* Add zone redundant property for database, elastic pool and capability edition

* Added zone redundant property release notes

* Revert "Removing build tools outside of branches (#3780)"

This reverts commit deceaf3.

* Revert "Revert "Removing build tools outside of branches (#3780)""

This reverts commit 58265b9.

* Rerun tests to fix validation errors

* Remove null capability test

* Cancel pipeline run (#3812)

* Cancel pipeline run api

* Makin cancel run to factory operation

* Example and unit test for cancel pipeline run api.

* Regenerating SDK accoring to latest instructions

* Scenario test for cancel run api

* Scenario test for pipeline run 2

* Regenerating SDK and adding text file with generation metadata

* Adding version 0.2.1

* Merged ADMS changes for Oct. SDK release

* Add linked service scenario test (resolves #3726) (#3798)

* Adds a simple CRUD test for linked services
  * Also change all tests to check for proper HTTP response codes on
    each API call
  * Resolves #3726

* Updated RecoveryServices.Backup Tests (#3822)

- Updated tests to address Azure/azure-sdk-for-python#1422
- Updated test settings (VM name etc) for Backup tests and re-recorded
tests
JasonYang-MSFT pushed a commit to JasonYang-MSFT/azure-sdk-for-net that referenced this pull request Dec 8, 2017
* Update ACR SDK to 2017-10-01 version

* Update csproj, re-record tests

* Address PR review feedback

Address PR review feedback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants