Skip to content

Commit

Permalink
[Azure Search] Merge psSdkJson6 to preview branch (#4114)
Browse files Browse the repository at this point in the history
* SDK Change for SAP ECC (#4063)

* add new LinkedService for vertica and netezza, update googleBigQuery (#4070)

* add new connector Veritca and Netezza, update Google BigQuery

* add new connector Veritca and Netezza, update Google BigQuery

* update changelog

* resolve conflicts

* update changelog

* ManagementGroups SDK (#4071)

* ManagementGroups SDK

* Minor changes

* Fixing readme (#4066)

* [DataFactory] Updating the SDK version and release notes for 0.5.0 before publishing (#4077)

* Updating ADF SDK version for the release

* Updating ADF SDK version for the release

* Fixing the version for ADF SDK and updating the release notes

* Updated the version in csproj and AssemblyInfo

* Changed version of Microsoft.Azure.Management.Sql to 1.12.0-preview (#4048)

* Adding ZoneBalance and PlatformFaultDomainCount for vm scale set (#4069)

* Content moderator update (#4082)

* Content moderator update

* modified screen text api

* Updated the version

* Improving reliability of SQL ServerKey tests by adding a short wait between key vault creation and key creation (#4072)

* Added more convenient method to rename database (#4056)

* Add convenient Database.Rename methods

Fixes #4055

* Added test recording

* Fixed duplicate release note

* Move custom code into customization folder

* Skps sdk json6 (#4061)

* Added SDK changes for ActionGroup Changes

* added change log entry

* fixed the Nuget.Config

* Commented the unecessary line

* Skipped unecessary test

* Revrted the version change for Newtonsoft library.

* Fixed a comment from SDK team

* Update Monitor.Tests.csproj

* Changed the Assemblyinfo.cs to change the version.

* EventGrid SDK: Removing the preview suffix from the version (#4081)

* Regenerated the SDK and re-recorded the tests based on the newer API version.

* Re-recorded the tests.

* Updated package release notes to reflect this set of changes.

* Re-recorded the tests.

* Updated the SDK based on the latest data-plane API specifications.

* Updated version and release notes.

* Update package version to 1.3.0 to remove the preview suffix.

* Fixed a typo in the release notes.

* Add new features to DataFactory SDK (#4084)

* Add new features
1. SecureOutput and BatchCount
2. Filter Activity
3. LInked Service Parameters
4. FilterActivity

* Update from running Generate.cmd

* Changes corresponding to new swagger PR for API:2018-01-10 (#4075)

* Changes corresponding to new swagger PR for API:2018-01-10

* Fixin tests and updating test jsons

* Updating nuget version to 2.0.0

* Regenerating changes corresponding to comments on swagger PR.

* Updating metadata files as per review comment.

* Addressing review comments

* Changing customConfig to long and making it a required parameter (#4017)

* Regenerating using generate.cmd

* Updating minor nuget version for customsearch

* Updating link for test framework documentation

* Revise notice.txt of Cognitive Services (#4074)

* Revise notice.txt

Revise notice.txt after PMs confirmed with CELA.

* Resolve review comments.

Resolve review comments.

* .NET SDK and its tests for the 2017-10-12  API version (#4076)

* .NET SDK and its tests for the 2017-10-12  API version

* Bump the version and generate the meta data file

* Updated the version and the metadata

* Fixed copyright symbol

* Made the AssemblyVersion and AssemblyFileVersion to match the nuget version

* [App Insights] Adding Data Plane SDK  (#4088)

* Adding initial AI Data Plane

* Updated generated code & added some metric & event extensions

* Added metric extension tests

* Tests & fixes for event extensions

* Updated AI Data Plane SDK

* Minor cleanup to SDK

* Fix typing of eventId, rows

* Fix tests

* Update directory structure; generate.cmd; solution + project files

* Fix solution project file

* regen from pssdkjson6

* add git commit

* adding generated artifacts

* updating csproj, adding build artifacts

* ServiceBus:  properties added to queue and subscription (#4097)

* EnableBatchedOperations property added to queue, DeadLetteringOnFilterEvaluationExceptions added to Subscription

* bump the minor version

* version changed to 1.1.0

* updated resource-manager.txt

* [KeyVault] adding readme.md for data-plane (#4100)

* creating Azure KeyVault SDK readme for data-plane

* readme updates for PR feedback

* Update Azure Database Migration Service to add Managed Instance as target (#4098)

* Update generated files using specs from latest public preview swagger.

* Fix tests.

* Changes:
- Regenerate models to include commit id.
- Update minor version number.

* Add generated AzSdk.RP.props

* Change version number to 0.2.0

* add dataaction attributes to permissions and Role Definition calls (#4079)

* update generated files

* update session recs and generated files

* fix failing tests

* comment extra line

* uncomment assemblyinfo file

* correct the session recs folder

* update session recs file to store and get ids

* add metadata files

* update csproj and assembleinfo file with newer version

* update props file

* update package notes

* [Azure Search] Upgrade data plane to latest AutoRest and split into 4 packages (#4104)

* [Azure Search] Upgrade data plane to the latest version of AutoRest

* [Azure Search] Splitting the data plane into four packages

What's motivating this change is a recognition that the data plane SDK is
really fulfilling three scenarios:

 1. Actually implementing search features in applications (full-text search,
    paging, faceted navigation, etc.)
 2. Indexing data via the push API
 3. Automating the management of indexes, synonyms, indexers, data sources,
    and other service-level resources.

Scenarios 1 and 2 are what you'd normally think of as "data plane". Scenario
3 is closer to "control plane" or management plane, or even "metadata plane"
since managing index schemas in particular is still pretty close to the data.

The split goes something like this:
 - Microsoft.Azure.Search.Data: Fulfills scenarios 1 and 2 above. This covers
   everything under the /docs resource. Currently most of this is custom code.
 - Microsoft.Azure.Search.Service: Fulfills scenario 3 above. This covers all
   top-level resources of the Azure Search Service REST API. This is mostly
   generated code, and our eventual goal is for nearly all of it to be
   generated.
 - Microsoft.Azure.Search.Common: Utilities common to Data and Service.
 - Microsoft.Azure.Search: A stub package that depends on all the others,
   plus defines the Indexes.GetClient() method that acts as a bridge from
   SearchServiceClient to SearchIndexClient. This package provides a
   convenient upgrade path for existing SDK users.

Eventually we're thinking of using Microsoft.Azure.Search.Service in
conjunction with Microsoft.Azure.Management.Search to implement a rich set
of PowerShell CmdLets that can manage indexes, data sources, indexers, etc.
in addition to the ARM-level resources.

* [Azure Search] Factoring out data plane assembly and package versions

Also bumping all data plane package major versions since moving types to
different assemblies is a breaking change.

* [Azure Search] Replacing ConverterBase with JsonReader extension methods

Reuse via inheritance is an anti-pattern, so we're getting rid of it.

* [Azure Search] Fixing issue with copying JsonSerializerSettings

Since the Azure .NET SDKs have to support a wide range of JSON.NET versions,
it isn't safe to reference properties of JsonSerializerSettings by name since
these properties come and go between versions. Instead, we use reflection to
dynamically generate code to copy a JsonSerializerSettings instance.

* [Azure Search] Versioning each data plane package separately

After some discussion, we decided it was better for the purposes of decoupled
development and release that we version each of the data plane packages
separately.
  • Loading branch information
brjohnstmsft authored and shahabhijeet committed Mar 7, 2018
1 parent 45548a7 commit 6369c0b
Show file tree
Hide file tree
Showing 1,376 changed files with 75,516 additions and 23,786 deletions.
2 changes: 1 addition & 1 deletion Documentation/Using-Azure-TestFramework.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Azure SDK for .NET uses the same Record/Playback test framework that Azure PowerShell uses. This is documented at https://github.com/Azure/azure-powershell/blob/preview/documentation/Using-Azure-TestFramework.md .
Azure SDK for .NET uses the same Record/Playback test framework that Azure PowerShell uses. This is documented at https://github.com/Azure/azure-powershell/blob/preview/documentation/testing-docs/using-azure-test-framework.md .
54 changes: 23 additions & 31 deletions src/SDKs/ApplicationInsights/ApplicationInsights.sln
Original file line number Diff line number Diff line change
@@ -1,46 +1,38 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.Tests", "ApplicationInsights.Tests\ApplicationInsights.Tests.csproj", "{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.ApplicationInsights.Tests", "DataPlane\Data.ApplicationInsights.Tests\Data.ApplicationInsights.Tests.csproj", "{FA06A27D-4D07-4157-9C61-36BEBD67970D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.ApplicationInsights", "Management.ApplicationInsights\Microsoft.Azure.Management.ApplicationInsights.csproj", "{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.Tests", "Management\ApplicationInsights.Tests\ApplicationInsights.Tests.csproj", "{6ECF131B-7B54-48EC-BC33-100AA82C4206}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.ApplicationInsights", "Management\Management.ApplicationInsights\Microsoft.Azure.Management.ApplicationInsights.csproj", "{218115E9-B94C-4CBE-9FE4-485DCA96C2FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.ApplicationInsights", "DataPlane\ApplicationInsights\Microsoft.Azure.ApplicationInsights.csproj", "{69672630-2C7C-401F-B923-1D507BD63383}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Net45-Debug|Any CPU = Net45-Debug|Any CPU
Net45-Release|Any CPU = Net45-Release|Any CPU
Portable-Debug|Any CPU = Portable-Debug|Any CPU
Portable-Release|Any CPU = Portable-Release|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0BC5FFA-C113-4212-BE4A-F95CC8BB4D91}.Release|Any CPU.Build.0 = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A1E2ACF-218C-481F-A501-7BB3F3C0B873}.Release|Any CPU.Build.0 = Release|Any CPU
{FA06A27D-4D07-4157-9C61-36BEBD67970D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA06A27D-4D07-4157-9C61-36BEBD67970D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA06A27D-4D07-4157-9C61-36BEBD67970D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA06A27D-4D07-4157-9C61-36BEBD67970D}.Release|Any CPU.Build.0 = Release|Any CPU
{6ECF131B-7B54-48EC-BC33-100AA82C4206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ECF131B-7B54-48EC-BC33-100AA82C4206}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ECF131B-7B54-48EC-BC33-100AA82C4206}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ECF131B-7B54-48EC-BC33-100AA82C4206}.Release|Any CPU.Build.0 = Release|Any CPU
{218115E9-B94C-4CBE-9FE4-485DCA96C2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{218115E9-B94C-4CBE-9FE4-485DCA96C2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{218115E9-B94C-4CBE-9FE4-485DCA96C2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{218115E9-B94C-4CBE-9FE4-485DCA96C2FF}.Release|Any CPU.Build.0 = Release|Any CPU
{69672630-2C7C-401F-B923-1D507BD63383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69672630-2C7C-401F-B923-1D507BD63383}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69672630-2C7C-401F-B923-1D507BD63383}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69672630-2C7C-401F-B923-1D507BD63383}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
7 changes: 7 additions & 0 deletions src/SDKs/ApplicationInsights/AzSdk.RP.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag />
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Microsoft.Rest;
using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.Azure.ApplicationInsights
{
public class ApiKeyClientCredentials : ServiceClientCredentials
{
private string token;

public ApiKeyClientCredentials(string token)
{
if (string.IsNullOrEmpty(token))
{
throw new ArgumentException($"{nameof(token)} must not be null or empty");
}

this.token = token;
}

public override Task ProcessHttpRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
request.Headers.Add("x-api-key", token);
return Task.FromResult(true);
}
}
}
Loading

0 comments on commit 6369c0b

Please sign in to comment.