Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Publish"

on:
push:
branches: [ rel-8.3.0 ]
branches: [ rel-8.3.4 ]
env:
DOTNET_VERSION: "8.0.200"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Tagged Release"

on:
push:
branches: [ rel-8.3.0 ]
branches: [ rel-8.3.4 ]

jobs:
tagged-release:
Expand All @@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "8.3.0"
automatic_release_tag: "8.3.4"
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<DotNetCoreCAPPackageVersion>8.2.0</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<ElsaNextPackageVersion>3.2.3</ElsaNextPackageVersion>
<VoloAbpPackageVersion>8.3.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.3.0</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>8.3.4</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.3.4</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftAspNetCorePackageVersion>8.0.0</MicrosoftAspNetCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Version>8.3.0</Version>
<Version>8.3.4</Version>
<Copyright>colin</Copyright>
<Description>Use LINGYUN.MicroService.Templates command line</Description>
<PackAsTool>true</PackAsTool>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
await CreateProjectService.CreateAsync(projectArgs);
}

public string GetShortDescription()
public static string GetShortDescription()
{
return "Generate a new solution based on the customed ABP startup templates.";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public string GetUsageInfo()
return sb.ToString();
}

public string GetShortDescription()
public static string GetShortDescription()
{
return "Generates client service proxies and DTOs to consume HTTP APIs.";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private GenerateViewArgs BuildArgs(CommandLineArgs commandLineArgs)
serviceType);
}

public string GetShortDescription()
public static string GetShortDescription()
{
return "Generate the view code from the http api proxy.";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Cli;
Expand Down Expand Up @@ -70,14 +71,14 @@ public string GetUsageInfo()

foreach (var command in AbpCliOptions.Commands.ToArray())
{
string shortDescription;

using (var scope = ServiceScopeFactory.CreateScope())
var method = command.Value.GetMethod("GetShortDescription", BindingFlags.Static | BindingFlags.Public);
if (method == null)
{
shortDescription = ((IConsoleCommand)scope.ServiceProvider
.GetRequiredService(command.Value)).GetShortDescription();
continue;
}

var shortDescription = (string)method.Invoke(null, null);

sb.Append(" > ");
sb.Append(command.Key);
sb.Append(string.IsNullOrWhiteSpace(shortDescription) ? "" : ":");
Expand Down
3 changes: 3 additions & 0 deletions aspnet-core/framework/open-api/OpenApi.Sdk/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<ConfigureAwait />
</Weavers>
30 changes: 30 additions & 0 deletions aspnet-core/framework/open-api/OpenApi.Sdk/FodyWeavers.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>
2 changes: 1 addition & 1 deletion aspnet-core/services/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\Directory.Packages.props" />
<PropertyGroup>
<LYAbpPackageVersion>8.3.0</LYAbpPackageVersion>
<LYAbpPackageVersion>8.3.4</LYAbpPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,31 @@ private void ConfigureDbContext(IConfiguration configuration)
{
Configure<AbpDbConnectionOptions>(options =>
{
configuration.GetSection("Databases").Bind(options.Databases);
options.Databases.Configure("Default", db =>
{
db.MappedConnections.Add("AbpIdentity");
db.MappedConnections.Add("AppPlatform");
db.MappedConnections.Add("TaskManagement");
db.MappedConnections.Add("Notifications");
db.MappedConnections.Add("MessageService");
db.MappedConnections.Add("AbpAuditLogging");
db.MappedConnections.Add("AbpOpenIddict");
db.MappedConnections.Add("AbpIdentityServer");
db.MappedConnections.Add("AbpFeatureManagement");
db.MappedConnections.Add("AbpSettingManagement");
db.MappedConnections.Add("AbpPermissionManagement");
});

options.Databases.Configure("HostOnly", db =>
{
db.MappedConnections.Add("AbpSaas");
db.MappedConnections.Add("AbpTextTemplating");
db.MappedConnections.Add("AbpLocalizationManagement");
db.MappedConnections.Add("Workflow");
db.MappedConnections.Add("Demo");

db.IsUsedByTenants = false;
});
});
Configure<AbpDbContextOptions>(options =>
{
Expand Down
Loading
Loading