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

Jump to bottom

fix: 修改打包失败问题 #499

Merged
merged 1 commit into from
Aug 1, 2024
Merged

fix: 修改打包失败问题 #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ exec { & dotnet test $solution -c Release --no-build -l trx --verbosity=normal }

# Core
exec { & dotnet pack .\src\EasilyNET.Core\EasilyNET.Core.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
exec { & dotnet pack .\src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
exec { & dotnet pack .\src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj -c Release -o $artifacts --no-build }
exec { & dotnet pack .\src\EasilyNET.WebCore\EasilyNET.WebCore.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
exec { & dotnet pack .\src\EasilyNET.WebCore.Swagger\EasilyNET.WebCore.Swagger.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }

Expand Down
2 changes: 1 addition & 1 deletion sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.9.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2-dev-00341" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.EventLog" Version="4.0.1-dev-00087" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
Expand Down
69 changes: 34 additions & 35 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +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.134-beta" />
<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.2-dev-02220" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.13" />
<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.134-beta" />
<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.7" />
<PackageVersion Include="Serilog" Version="4.0.2-dev-02220" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.13" />
<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>
9 changes: 3 additions & 6 deletions src/EasilyNET.RabbitBus.AspNetCore/ServiceCollectionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ private static IServiceCollection RabbitPersistentConnection(this IServiceCollec
{
return new()
{
Uri = new(config.ConnectionString),
DispatchConsumersAsync = true
Uri = new(config.ConnectionString)
};
}
if (config.AmqpTcpEndpoints is not null && config.AmqpTcpEndpoints.Count is not 0)
Expand All @@ -86,8 +85,7 @@ private static IServiceCollection RabbitPersistentConnection(this IServiceCollec
{
UserName = config.UserName,
Password = config.PassWord,
VirtualHost = config.VirtualHost,
DispatchConsumersAsync = true
VirtualHost = config.VirtualHost
};
}
if (config.Host is not null && !string.IsNullOrWhiteSpace(config.Host))
Expand All @@ -98,8 +96,7 @@ private static IServiceCollection RabbitPersistentConnection(this IServiceCollec
UserName = config.UserName,
Password = config.PassWord,
Port = config.Port,
VirtualHost = config.VirtualHost,
DispatchConsumersAsync = true
VirtualHost = config.VirtualHost
};
}
throw new("无法从配置中创建链接");
Expand Down