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.

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

feat: 更新依赖. #492

Merged
merged 1 commit into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions sample/WebApi.Test.Unit/AppWebModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using EasilyNET.AutoDependencyInjection.Contexts;
using EasilyNET.AutoDependencyInjection.Modules;
using EasilyNET.WebCore.Handlers;
using WebApi.Test.Unit.ServiceModules;

// ReSharper disable ClassNeverInstantiated.Global

Expand Down
6 changes: 3 additions & 3 deletions sample/WebApi.Test.Unit/ServiceModules/ControllersModule.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using System.Net;
using System.Text.Json.Serialization;
using EasilyNET.AutoDependencyInjection.Contexts;
using EasilyNET.AutoDependencyInjection.Modules;
using EasilyNET.WebCore.JsonConverters;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using System.Net;
using System.Text.Json.Serialization;
using WebApi.Test.Unit.Common;

// ReSharper disable UnusedType.Local
// ReSharper disable ClassNeverInstantiated.Global

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// 注册一些控制器的基本内容
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/ServiceModules/CorsModule.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using EasilyNET.AutoDependencyInjection.Contexts;
using EasilyNET.AutoDependencyInjection.Modules;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// 配置跨域服务及中间件
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using EasilyNET.AutoDependencyInjection.Contexts;
using EasilyNET.AutoDependencyInjection.Modules;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// 分布式锁
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using EasilyNET.AutoDependencyInjection.Modules;
using WebApi.Test.Unit.Common;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <inheritdoc />
internal sealed class MemoryCacheModule : AppModule
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/ServiceModules/MongoFSModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Server.Kestrel.Core;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// GridFS
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/ServiceModules/MongoModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using EasilyNET.MongoSerializer.AspNetCore;
using MongoDB.Driver.Linq;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// MongoDB驱动模块
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using OpenTelemetry.Metrics;
using OpenTelemetry.Trace;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// OpenTelemetry相关内容
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using EasilyNET.AutoDependencyInjection.Modules;
using WebApi.Test.Unit.Common;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// 缓存
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/ServiceModules/RabbitModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using EasilyNET.AutoDependencyInjection.Modules;
using EasilyNET.RabbitBus.AspNetCore.Enums;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// Rabbit服务注册
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using EasilyNET.AutoDependencyInjection.Contexts;
using System.IO.Compression;
using EasilyNET.AutoDependencyInjection.Contexts;
using EasilyNET.AutoDependencyInjection.Modules;
using Microsoft.AspNetCore.ResponseCompression;
using System.IO.Compression;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// 响应压缩
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/ServiceModules/SwaggerModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using EasilyNET.AutoDependencyInjection.Modules;
using Microsoft.OpenApi.Models;

namespace WebApi.Test.Unit;
namespace WebApi.Test.Unit.ServiceModules;

/// <summary>
/// Swagger文档的配置
Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<PackageReference Include="Serilog.Sinks.EventLog" Version="4.0.1-dev-00087" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0-dev-00317" />
<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0-dev-00322" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

Expand Down
71 changes: 34 additions & 37 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,40 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>

<Project>
<PropertyGroup>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);IDE0130;</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="MessagePack" Version="3.0.111-alpha" />
<PackageVersion Include="MongoDB.Bson" Version="2.27.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.27.0" />
<PackageVersion Include="MongoDB.Driver.Core" Version="2.27.0" />
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.27.0" />
<PackageVersion Include="RabbitMQ.Client" Version="7.0.0-rc.5" />
<PackageVersion Include="Serilog" Version="4.0.1-dev-02205" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.10" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
<!--microsoft asp.net core -->
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.0.0-preview.6.24353.1" />
</ItemGroup>
<PropertyGroup>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);IDE0130;</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="MessagePack" Version="3.0.111-alpha" />
<PackageVersion Include="MongoDB.Bson" Version="2.28.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
<PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.28.0" />
<PackageVersion Include="RabbitMQ.Client" Version="7.0.0-rc.6" />
<PackageVersion Include="Serilog" Version="4.0.1-dev-02205" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.11" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
<!--microsoft asp.net core -->
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.0.0-preview.6.24353.1" />
</ItemGroup>
</Project>