[Azure Search] Merge psSdkJson6 to search-4x-preview-vs17#4065
Merged
brjohnstmsft merged 7 commits intoAzure:search-4x-preview-vs17from Feb 13, 2018
Merged
Conversation
* adding a way to detect test/playback mode. Enabled Retry-After for test mode. Now it is possible to add tests for Retry-After * updating CR version for CR test projects
* Recreate fork due to multiple issues in Azure/azure-sdk-for-net * Update upstream per shahabhijeet. Can you do the following in the below order: Pull latest from upstream (if you have already done this good) Execute msbuild.exe build.proj from the repo root a. This will update the build tools in the current repo Generate your SDK Build you sdk at least one from command line of IDE a. Msbuild.exe build.proj /t:build /p:Scope=SDKs\ProvisioningServices Update the PR * PR review requested changes * Fix typo * Update to handle if unexpected access policy is used. * Feedback from shahabhijeet * Remove AzSdk.RP.props file randomly created * Regenerate client from latest swagger spec and rerecord tests. * swagger spec renamed from "provisioningservice" to "deviceprovisioningservice" * provisioningservices cleanup * Feedback from @shabhijeet
#4041) * Add two properties into LinkedIntegrationRuntime and update to latest spec * Regenerate SDK according the comments * Update change logs
* [CODE GEN] ADLS * Removed ErrorDetails.cs -- it was unused * Account to Accounts for operations * Explicit parameter objects for creation and update * [CODE GEN] Metadata * Fixing custom code for file rename * Updating tests * Account refactor * Permission field of AclStatus from int to string * Updating tests * Updating SessionRecords * [VERSION] 2.3.3-preview to 2.4.0-preview * [CHANGELOG] Update * ADLS metadata update * ADLA metadata update
…ts (#4060) Two of the JsonSerializationTests modify JsonConvert.DefaultSettings. They do this in order to validate that SafeJsonConvert does not rely on these settings. Before this change, these tests would install a custom JSON converter and contract resolver that always throw. Unfortunately, other aspects of the test infrastructure rely on DefaultSettings, so this would sometimes result in unexpected exceptions being thrown. The solution is to weaken the effect of changing DefaultSettings. Now, the SafeJsonConvert tests install a custom converter for their own Model class that produces incorrect results. Because it's targeted at that class specifically, it should have no side effects on other code that relies on DefaultSettings.
…ersion (#4062) * Search SDK: Re-applying changes from search-4x-preview branch to vs17Dev I tried rebasing the search-4x-preview branch to vs17Dev, but the results were very messy, so instead this is just a squash-merge of all the changes. This should differ from search-4x-preview only in the project files and some minor test changes to account for behavioral changes in the latest version of ClientRuntime. * Search SDK: Fixing failing tests * Search SDK: Re-recording mocks for the preview SDKs * Search SDK: Updating copyright dates * Search SDK: Rename Management SDK project and update build script (#3236) * Renaming Management.Search to Microsoft.Azure.Management.Search The package and assembly names were accidentally changed during the VS2017 migration. This fixes it. * Search SDK: Updating Build-SearchPackages script * [Azure Search] Bumping preview SDK version to 4.0.2-preview This new version includes some minor bug fixes that just shipped in the 3.0.5 GA SDK.
mhko
approved these changes
Feb 13, 2018
Yahnoosh
approved these changes
Feb 13, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I goofed and bumped the preview SDK version on the wrong branch. This merges that change back to the preview branch, along with the latest changes in the rest of the repo.
FYI @Yahnoosh @mhko -- I just need a sign off and then I can merge this myself, since we own the target branch.
Description
This checklist is used to make sure that common guidelines for a pull request are followed.
General Guidelines
Testing Guidelines
SDK Generation Guidelines
*.csprojandAssemblyInfo.csfiles have been updated with the new version of the SDK.