Skip to content

Commit 65a2ad5

Browse files
gewarrengewarren
committed
resolve merge conflicts
2 parents dbf0609 + 651ae50 commit 65a2ad5

File tree

2,593 files changed

+124818
-95582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,593 files changed

+124818
-95582
lines changed

‎_zip/missingapi.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ references:
3535
name: AssistantClient
3636
fullname: OpenAI.Assistants.AssistantClient
3737
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
38+
- uid: OpenAI.Assistants.FunctionToolDefinition
39+
name: FunctionToolDefinition
40+
fullname: OpenAI.Assistants.FunctionToolDefinition
41+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
3842
- uid: OpenAI.Audio.AudioClient
3943
name: AudioClient
4044
fullname: OpenAI.Audio.AudioClient
@@ -43,6 +47,10 @@ references:
4347
name: ChatClient
4448
fullname: OpenAI.Chat.ChatClient
4549
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
50+
- uid: OpenAI.Chat.ChatTool
51+
name: ChatTool
52+
fullname: OpenAI.Chat.ChatTool
53+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
4654
- uid: OpenAI.Embeddings.EmbeddingClient
4755
name: EmbeddingClient
4856
fullname: OpenAI.Embeddings.EmbeddingClient
@@ -51,6 +59,10 @@ references:
5159
name: OpenAIClient
5260
fullname: OpenAI.OpenAIClient
5361
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
62+
- uid: OpenAI.Realtime.ConversationFunctionTool
63+
name: ConversationFunctionTool
64+
fullname: OpenAI.Realtime.ConversationFunctionTool
65+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
5466
- uid: OpenAI.RealtimeConversation.ConversationFunctionTool
5567
name: ConversationFunctionTool
5668
fullname: OpenAI.RealtimeConversation.ConversationFunctionTool
@@ -71,6 +83,10 @@ references:
7183
name: OpenAIResponseClient
7284
fullname: OpenAI.Responses.OpenAIResponseClient
7385
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
86+
- uid: OpenAI.Responses.ResponseTool
87+
name: ResponseTool
88+
fullname: OpenAI.Responses.ResponseTool
89+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
7490
- uid: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1
7591
name: CircuitBreakerStrategyOptions`1
7692
fullname: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/Format/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/IBinarySerialize/Read/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsEnd/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlContext.WindowsIdentity Sample/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/WindowsIdentity/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlDataRecord/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlFunctionAttribute Sample/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlFunctionAttribute/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMethodAttribute Sample/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlMethodAttribute/Overview/source.vb

File renamed without changes.

‎snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.ExecuteAndSend/VB/source.vb renamed to ‎snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/ExecuteAndSend/source.vb

File renamed without changes.

0 commit comments

Comments
 (0)