diff --git a/OllamaStudy.UseExtensionsAI/UseOpenAITest.cs b/OllamaStudy.UseExtensionsAI/UseOpenAITest.cs index aef02c1..76ef483 100644 --- a/OllamaStudy.UseExtensionsAI/UseOpenAITest.cs +++ b/OllamaStudy.UseExtensionsAI/UseOpenAITest.cs @@ -1,23 +1,23 @@ using System.ClientModel; +using Xunit.Abstractions; + using OpenAI; using OpenAI.Chat; -using Xunit.Abstractions; - namespace OllamaStudy.UseExtensionsAI { - public class UseXUnitTest + public class UseOpenAITest { private ITestOutputHelper _output; - public UseXUnitTest(ITestOutputHelper outputHelper) + public UseOpenAITest(ITestOutputHelper outputHelper) { _output = outputHelper; } [Fact] - public void UseXunit_Test() + public void OpenAI_Test() { ChatClient openAIClient = new ChatClient ( diff --git a/OllamaStudy.UseExtensionsAI/UseXUnitTest.cs b/OllamaStudy.UseExtensionsAI/UseXUnitTest.cs index 53626ac..d5dc546 100644 --- a/OllamaStudy.UseExtensionsAI/UseXUnitTest.cs +++ b/OllamaStudy.UseExtensionsAI/UseXUnitTest.cs @@ -2,19 +2,23 @@ namespace OllamaStudy.UseExtensionsAI { - public class UseOpenAITestcs + public class UseXUnitTest { private ITestOutputHelper _output; - public UseOpenAITestcs(ITestOutputHelper outputHelper) + public UseXUnitTest(ITestOutputHelper outputHelper) { _output = outputHelper; } [Fact] - public void UseOpenAI_Test() + public void UseXunit_Test() { - + string message = "使用xUnit单元测试框架!"; + + _output.WriteLine(message); + + Assert.True(true, message); } } } diff --git a/OllamaStudy.UseSemanticKernel/GloabolUsing.cs b/OllamaStudy.UseSemanticKernel/GloabolUsing.cs new file mode 100644 index 0000000..4ea880a --- /dev/null +++ b/OllamaStudy.UseSemanticKernel/GloabolUsing.cs @@ -0,0 +1,47 @@ +global using System; +global using System.Collections; +global using System.Collections.Generic; +global using System.Collections.Frozen; +global using System.Collections.Concurrent; +global using System.Collections.Specialized; +global using System.Collections.ObjectModel; +global using System.Linq; +global using System.Linq.Expressions; +global using System.IO; +global using System.Text; +global using System.Text.Json; +global using System.Text.Json.Serialization; +global using System.Threading; +global using System.Threading.Tasks; +global using System.Threading.Channels; +global using System.Net.Http; +global using System.Net.Http.Json; +global using System.Net.Http.Headers; + + +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.DependencyInjection.Extensions; +global using Microsoft.Extensions.Configuration; +global using Microsoft.Extensions.Configuration.Binder; +global using Microsoft.Extensions.Configuration.Ini; +global using Microsoft.Extensions.Configuration.Xml; +global using Microsoft.Extensions.Configuration.Json; +global using Microsoft.Extensions.Configuration.Memory; +global using Microsoft.Extensions.Configuration.UserSecrets; +global using Microsoft.Extensions.Configuration.CommandLine; +global using Microsoft.Extensions.Configuration.EnvironmentVariables; +global using Microsoft.Extensions.Options; +global using Microsoft.Extensions.Logging; +global using Microsoft.Extensions.Logging.Configuration; +global using Microsoft.Extensions.Logging.Console; +global using Microsoft.Extensions.Logging.Debug; +global using Microsoft.Extensions.Logging.EventLog; +global using Microsoft.Extensions.Logging.EventSource; + +global using Xunit; +global using Xunit.Sdk; +global using Xunit.Extensions; + +global using OllamaStudy.Core; + + diff --git a/OllamaStudy.UseSemanticKernel/OllamaStudy.UseSemanticKernel.csproj b/OllamaStudy.UseSemanticKernel/OllamaStudy.UseSemanticKernel.csproj index d058235..60aec73 100644 --- a/OllamaStudy.UseSemanticKernel/OllamaStudy.UseSemanticKernel.csproj +++ b/OllamaStudy.UseSemanticKernel/OllamaStudy.UseSemanticKernel.csproj @@ -20,6 +20,10 @@ + + + + diff --git a/OllamaStudy.UseSemanticKernel/Startup.cs b/OllamaStudy.UseSemanticKernel/Startup.cs new file mode 100644 index 0000000..0f1b82d --- /dev/null +++ b/OllamaStudy.UseSemanticKernel/Startup.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; + +using Microsoft.Extensions.Hosting; + +using OllamaStudy.Core; + + +namespace OllamaStudy.UseSemanticKernel +{ + /// + /// + /// + public class Startup + { + //支持两种配置样式,并且两种 Configure 方法都受支持 + #region HostApplicationBuilder 风格, 此风格优先级高于Startup(只执行一种风格) + //public void ConfigureHostApplicationBuilder(IHostApplicationBuilder hostApplicationBuilder) + //{ + + //} + + //public IHost BuildHostApplicationBuilder(HostApplicationBuilder hostApplicationBuilder) + //{ + // return hostApplicationBuilder.Build(); + //} + #endregion + + #region Startup 风格 + + /// + /// (可选) 创建IHostBuilder + /// + /// + public IHostBuilder CreateHostBuilder() + { + return Host.CreateDefaultBuilder(); + } + + public void ConfigureHost(IHostBuilder hostBuilder) + { + hostBuilder.ConfigureAppConfiguration((hostBuilder,configBuilder) => + { + configBuilder + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("OllamaServerConfig.json", false, true); + }); + } + + /// + /// (可选) 构建Host + /// + /// + /// + public IHost BuildHost(IHostBuilder hostBuilder) + { + return hostBuilder.Build(); + } + + /// + /// 配置服务 + /// + /// + /// + public void ConfigureServices(IServiceCollection services, HostBuilderContext context) + { + services + .AddOptions() + .Configure(context.Configuration.GetRequiredSection("OllamaServer")); + } + #endregion + } +} diff --git a/OllamaStudy.UseSemanticKernel/UseXUnitTest.cs b/OllamaStudy.UseSemanticKernel/UseXUnitTest.cs new file mode 100644 index 0000000..4fd8607 --- /dev/null +++ b/OllamaStudy.UseSemanticKernel/UseXUnitTest.cs @@ -0,0 +1,24 @@ +using Xunit.Abstractions; + +namespace OllamaStudy.UseSemanticKernel +{ + public class UseXUnitTest + { + private ITestOutputHelper _output; + + public UseXUnitTest(ITestOutputHelper outputHelper) + { + _output = outputHelper; + } + + [Fact] + public void UseXunit_Test() + { + string message = "使用xUnit单元测试框架!"; + + _output.WriteLine(message); + + Assert.True(true, message); + } + } +}