Skip to content

[Azure Search] Merge psSdkJson6 to preview branch #4114

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

Merged
shahabhijeet merged 25 commits into from
Mar 7, 2018
Merged

[Azure Search] Merge psSdkJson6 to preview branch #4114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a0ebfb6
SDK Change for SAP ECC (#4063)
wenbof Feb 12, 2018
2cbb187
add new LinkedService for vertica and netezza, update googleBigQuery …
Eva-Xiao Feb 13, 2018
2257a51
ManagementGroups SDK (#4071)
rajshah11 Feb 13, 2018
a1edef0
Fixing readme (#4066)
ro-joowan Feb 13, 2018
be68c42
[DataFactory] Updating the SDK version and release notes for 0.5.0 be…
hvermis Feb 14, 2018
016a997
Changed version of Microsoft.Azure.Management.Sql to 1.12.0-preview (…
kosta-bizetic Feb 19, 2018
9212a31
Adding ZoneBalance and PlatformFaultDomainCount for vm scale set (#4069)
hyonholee Feb 19, 2018
c95b3ed
Content moderator update (#4082)
v-sodsou Feb 20, 2018
fd93eca
Improving reliability of SQL ServerKey tests by adding a short wait b…
mihymel Feb 20, 2018
06cbf8c
Added more convenient method to rename database (#4056)
jaredmoo Feb 22, 2018
6e505b5
Skps sdk json6 (#4061)
shriku11 Feb 22, 2018
37d5bc3
EventGrid SDK: Removing the preview suffix from the version (#4081)
kalyanaj Feb 22, 2018
fcf132d
Add new features to DataFactory SDK (#4084)
haricr Feb 22, 2018
f074b5c
Changes corresponding to new swagger PR for API:2018-01-10 (#4075)
avneeshraiusit Feb 22, 2018
513b3f7
Changing customConfig to long and making it a required parameter (#4017)
q3blend Feb 23, 2018
9a45600
Updating link for test framework documentation
shahabhijeet Feb 24, 2018
f06764a
Revise notice.txt of Cognitive Services (#4074)
felixwa Feb 26, 2018
ed69cd1
.NET SDK and its tests for the 2017-10-12 API version (#4076)
prakharsharma10 Feb 28, 2018
68add0f
[App Insights] Adding Data Plane SDK (#4088)
alexeldeib Mar 1, 2018
f93c10b
ServiceBus: properties added to queue and subscription (#4097)
Mar 1, 2018
f3d8221
[KeyVault] adding readme.md for data-plane (#4100)
Mar 2, 2018
c3dea7a
Update Azure Database Migration Service to add Managed Instance as ta…
hitenjava Mar 5, 2018
ee254ee
add dataaction attributes to permissions and Role Definition calls (#…
darshanhs90 Mar 6, 2018
732cfcf
[Azure Search] Upgrade data plane to latest AutoRest and split into 4…
bitsforthought Mar 7, 2018
ed82eb7
Merge branch 'psSdkJson6' into search-merge-ga-to-preview
bitsforthought Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Documentation/Using-Azure-TestFramework.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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>
29 changes: 29 additions & 0 deletions ...s/ApplicationInsights/DataPlane/ApplicationInsights/Customized/ApiKeyClientCredentials.cs
View file
Open in desktop
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