Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.Registry
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张龙涛
HYH.Registry
Commits
e9b0029b
Commit
e9b0029b
authored
Feb 11, 2022
by
zhanglongtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级dotnetcore5
parent
2605dc7b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
24 deletions
+40
-24
HYH.Registry.Application.csproj
src/HYH.Registry.Application/HYH.Registry.Application.csproj
+1
-1
HYH.Registry.Core.csproj
src/HYH.Registry.Core/HYH.Registry.Core.csproj
+1
-1
DbContextOptionsConfigurer.cs
...orkCore/EntityFrameworkCore/DbContextOptionsConfigurer.cs
+2
-2
HYH.Registry.EntityFrameworkCore.csproj
...tityFrameworkCore/HYH.Registry.EntityFrameworkCore.csproj
+2
-2
HYH.Registry.Web.Host.csproj
src/HYH.Registry.Web.Host/HYH.Registry.Web.Host.csproj
+24
-15
Startup.cs
src/HYH.Registry.Web.Host/Startup/Startup.cs
+8
-1
HYH.RegistryTests.csproj
test/HYH.Registry.Tests/HYH.RegistryTests.csproj
+2
-2
No files found.
src/HYH.Registry.Application/HYH.Registry.Application.csproj
View file @
e9b0029b
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>1.0.0.0</Version>
<TargetFramework>net
coreapp2.2
</TargetFramework>
<TargetFramework>net
5.0
</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>HYH.Registry.Application</AssemblyName>
<PackageId>HYH.Registry.Application</PackageId>
...
...
src/HYH.Registry.Core/HYH.Registry.Core.csproj
View file @
e9b0029b
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>1.0.0.0</Version>
<TargetFramework>net
coreapp2.2
</TargetFramework>
<TargetFramework>net
5.0
</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>HYH.Registry.Core</AssemblyName>
<PackageId>HYH.Registry.Core</PackageId>
...
...
src/HYH.Registry.EntityFrameworkCore/EntityFrameworkCore/DbContextOptionsConfigurer.cs
View file @
e9b0029b
...
...
@@ -7,12 +7,12 @@ namespace HYH.Registry.EntityFrameworkCore
{
public
static
void
Configure
(
DbContextOptionsBuilder
<
PlatformDbContext
>
builder
,
string
connectionString
)
{
builder
.
UseMySql
(
connectionString
);
builder
.
UseMySql
(
connectionString
,
ServerVersion
.
AutoDetect
(
connectionString
)
);
}
public
static
void
Configure
(
DbContextOptionsBuilder
<
PlatformDbContext
>
builder
,
DbConnection
connection
)
{
builder
.
UseMySql
(
connection
);
builder
.
UseMySql
(
connection
,
ServerVersion
.
AutoDetect
((
MySqlConnector
.
MySqlConnection
)
connection
)
);
}
}
}
src/HYH.Registry.EntityFrameworkCore/HYH.Registry.EntityFrameworkCore.csproj
View file @
e9b0029b
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>1.0.0.0</Version>
<TargetFramework>net
coreapp2.2
</TargetFramework>
<TargetFramework>net
5.0
</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>HYH.Registry.EntityFrameworkCore</AssemblyName>
<OutputType>Library</OutputType>
...
...
@@ -28,7 +28,7 @@
<ProjectReference Include="..\HYH.Registry.Core\HYH.Registry.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Abp.EntityFrameworkCore" Version="
5.10.1
" />
<PackageReference Include="Abp.EntityFrameworkCore" Version="
6.5.0
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
...
...
src/HYH.Registry.Web.Host/HYH.Registry.Web.Host.csproj
View file @
e9b0029b
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net
coreapp2.2
</TargetFramework>
<TargetFramework>net
5.0
</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>HYH.Registry.Web.Host</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>HYH.
System
.Web.Host</PackageId>
<PackageId>HYH.
Registry
.Web.Host</PackageId>
<UserSecretsId>HYH-System-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
<RazorCompileOnBuild>false</RazorCompileOnBuild>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile></DocumentationFile>
...
...
@@ -40,14 +42,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers
; buildtransitive
</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="3.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
...
...
@@ -56,13 +61,13 @@
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="
3.2
.0" />
<PackageReference Include="Serilog.AspNetCore" Version="
4.1
.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.
1
.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.
4
.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="
3.1.1
" />
<PackageReference Include="Serilog.Sinks.File" Version="
4.1
.0" />
<PackageReference Include="Serilog.Sinks.MongoDB" Version="
4.0.0
" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.
3
.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.
5
.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="
4.0.0
" />
<PackageReference Include="Serilog.Sinks.File" Version="
5.0
.0" />
<PackageReference Include="Serilog.Sinks.MongoDB" Version="
5.1.1
" />
<PackageReference Include="Castle.Core-Serilog" Version="4.4.1" />
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
</ItemGroup>
...
...
@@ -85,5 +90,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="http://json.schemastore.org/band-manifest" /></VisualStudio></ProjectExtensions>
<ProjectExtensions>
<VisualStudio>
<UserProperties appsettings_1json__JSONSchema="http://json.schemastore.org/band-manifest" />
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
src/HYH.Registry.Web.Host/Startup/Startup.cs
View file @
e9b0029b
...
...
@@ -64,10 +64,17 @@ namespace HYH.Registry.Web.Host.Startup
app
.
UseDeveloperExceptionPage
();
app
.
UsePermissiveCors
();
app
.
UseStaticFiles
();
app
.
UseRouting
();
app
.
UseConsulRegisterService
(
_configuration
);
app
.
UseAbpRequestLocalization
();
app
.
UseAuthentication
();
app
.
UseMvc
();
//app.UseMvc();
app
.
UseEndpoints
(
endpoints
=>
{
endpoints
.
MapControllerRoute
(
name
:
"default"
,
pattern
:
"{controller=Home}/{action=Index}/{id?}"
);
});
app
.
UseCustomSwagger
(
apiInfo
);
}
}
...
...
test/HYH.Registry.Tests/HYH.RegistryTests.csproj
View file @
e9b0029b
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>1.0.0.0</Version>
<TargetFramework>net
coreapp2.2
</TargetFramework>
<TargetFramework>net
5.0
</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>HYH.Registry.Tests</AssemblyName>
<PackageId>HYH.Registry.Tests</PackageId>
...
...
@@ -27,7 +27,7 @@
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Abp.TestBase" Version="4.9.0" />
<PackageReference Include="NSubstitute" Version="4.2.0" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.
3.1
" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.
4.0
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.4" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
</ItemGroup>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment