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

[Azure Search] Add new skill and cognitive services attachment to SDK #5223

Merged
merged 15 commits into from
Feb 15, 2019
Merged

[Azure Search] Add new skill and cognitive services attachment to SDK #5223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9678e8c
Regenerate SDK from updated swagger spec
Feb 9, 2019
3bcaaf5
Make changes to rearrange and replace NERSkill with EntitySkill
Feb 9, 2019
34cdf80
Mark NER classes and methods as obsolete
Feb 9, 2019
db54a45
Update from DocumentDb -> CosmosDb
Feb 9, 2019
bdbdefe
Update SessionRecords after re-running DataSource, Indexer and Skills…
Feb 9, 2019
56e9e57
Expose jsonLines parsing mode for indexer
Feb 12, 2019
8afccc4
Merge branch 'search-preview' into skillset-changes
arv100kri Feb 13, 2019
38a0ec6
Remove unnecessary tests and address other feedback
Feb 14, 2019
ed66c9e
Regenerate SkillsetsOperations.cs from swagger to avoid whitespace ch…
Feb 14, 2019
6df1062
Update SessionRecords for SkillsetTests
Feb 14, 2019
aeab6cc
Add comments and tests for ExtensibleEnum
Feb 14, 2019
5ffa42f
Re-run DataSourceTests and update session records
Feb 15, 2019
5264236
Add periods at the end of obsolete comments
Feb 15, 2019
1870c52
Update Obsolete message and fix up test naming
Feb 15, 2019
d49d7e8
Update test names to be less confusing
Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rosoft.Azure.Search.Service/Customizations/DataSources/Models/DataSource.Customization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public static DataSource CosmosDb(
/// <param name="deletionDetectionPolicy">Optional. The data deletion detection policy for the datasource.</param>
/// <param name="description">Optional. Description of the datasource.</param>
/// <returns>A new DataSource instance.</returns>
[Obsolete("DocumentDb method is deprecated. Use CosmosDb instead")]
[Obsolete("Use CosmosDb instead.")]
public static DataSource DocumentDb(
string name,
string documentDbConnectionString,
Expand Down
10 changes: 5 additions & 5 deletions src/SDKs/Search/DataPlane/Search.Tests/Tests/ExtensibleEnumTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public void CannotCompareDifferentEnumsForEquality()
[Fact]
public void CanCreateNonObsoleteTypeFromValue()
{
TestEnumWithObsolete notObsolete = TestEnumWithObsolete.Create("NotObsolete");
Assert.Same(TestEnumWithObsolete.NotObsolete, notObsolete);
TestEnumWithObsolete value = TestEnumWithObsolete.Create("Value");
Assert.Same(TestEnumWithObsolete.RecommendedPropertyValue, value);
}

[Fact]
Expand All @@ -85,7 +85,7 @@ public void CannotCreateObsoleteTypeFromValue()
// this should result in a new TestEnumWithObsolete instance being created
TestEnumWithObsolete obsolete = TestEnumWithObsolete.Create("Obsolete");
#pragma warning disable CS0612 // Type or member is obsolete
Assert.NotSame(TestEnumWithObsolete.Obsolete, obsolete);
Assert.NotSame(TestEnumWithObsolete.DeprecatedPropertyValue, obsolete);
#pragma warning restore CS0612 // Type or member is obsolete
}

Expand Down Expand Up @@ -113,10 +113,10 @@ private TestEnum2(string name) : base(name) { }

private class TestEnumWithObsolete : ExtensibleEnum<TestEnumWithObsolete>
{
public static readonly TestEnumWithObsolete NotObsolete = new TestEnumWithObsolete("NotObsolete");
public static readonly TestEnumWithObsolete RecommendedPropertyValue = new TestEnumWithObsolete("Value");

[Obsolete]
public static readonly TestEnumWithObsolete Obsolete = new TestEnumWithObsolete("NotObsolete");
public static readonly TestEnumWithObsolete DeprecatedPropertyValue = new TestEnumWithObsolete("Value");

[Obsolete]
public static readonly TestEnumWithObsolete Obsolete2 = new TestEnumWithObsolete("Obsolete");
Expand Down