tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Moved docs module to .net core 3.0

pull/1810/head
Halil İbrahim Kalkan 6 years ago
parent
3e49781460
commit
7b21d9d2c9
21 changed files with 33 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj
  2. 2
      modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
  3. 8
      modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
  4. 2
      modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs
  5. 9
      modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj
  6. 2
      modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
  7. 2
      modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
  8. 2
      modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj
  9. 18
      modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj
  10. 5
      modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj
  11. 2
      modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj
  12. 2
      modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
  13. 2
      modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
  14. 2
      modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj
  15. 10
      modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj
  16. 4
      modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj
  17. 4
      modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj
  18. 4
      modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj
  19. 10
      modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj
  20. 7
      modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj
  21. 4
      modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj

2
modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace />
</PropertyGroup>

2
modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>

8
modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@ -11,10 +11,10 @@
<ItemGroup>
<EmbeddedResource Include="Localization\Resources\VoloDocs\Web\*.json" />
<Content Remove="Localization\Resources\VoloDocs\Web\*.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
@ -39,8 +39,4 @@
<Folder Include="Logs\" />
</ItemGroup>
<ItemGroup>
<None Include="wwwroot\assets\images\Logo.png" />
</ItemGroup>
</Project>

2
modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs
View File

@ -1,6 +1,5 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.DependencyInjection;
using Swashbuckle.AspNetCore.Swagger;
@ -30,6 +29,7 @@ using Volo.Docs.Admin;
using Volo.Docs.Localization;
using VoloDocs.EntityFrameworkCore;
using Localization.Resources.AbpUi;
using Microsoft.Extensions.Hosting;
namespace VoloDocs.Web
{

9
modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj
View File

@ -10,13 +10,8 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\en.json" />
<None Remove="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\tr.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\en.json" />
<EmbeddedResource Include="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\tr.json" />
<EmbeddedResource Include="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\*.json" />
<Content Remove="Volo\Docs\Admin\Localization\Resources\Docs\ApplicationContracts\*.json" />
</ItemGroup>
<ItemGroup>

2
modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.Admin.HttpApi.Client</AssemblyName>
<PackageId>Volo.Docs.Admin.HttpApi.Client</PackageId>
<RootNamespace />

2
modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
View File

@ -6,6 +6,6 @@ namespace Volo.Docs.Admin
typeof(DocsAdminApplicationContractsModule))]
public class DocsAdminHttpApiClientModule : AbpModule
{
//TODO: Create client proxies!
}
}

2
modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.Admin.HttpApi</AssemblyName>
<PackageId>Volo.Docs.Admin.HttpApi</PackageId>
<RootNamespace />

18
modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.Admin.Web</AssemblyName>
<PackageId>Volo.Docs.Admin.Web</PackageId>
<OutputType>Library</OutputType>
@ -21,16 +21,10 @@
<PackageReference Include="CommonMark.NET" Version="0.15.1" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*.*" />
<EmbeddedResource Include="Pages\**\*.cshtml" />
<EmbeddedResource Include="Pages\**\*.css" />
<EmbeddedResource Include="Pages\**\*.js" />
</ItemGroup>
<ItemGroup>
<Content Remove="wwwroot\**\*.*" />
<Content Remove="Pages\**\*.cshtml" />
<Content Remove="Pages\**\*.css" />
<Content Remove="Pages\**\*.js" />
@ -41,14 +35,4 @@
<None Include="Properties\launchSettings.json" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
<Compile Update="Pages\Docs\Admin\Projects\Edit.cshtml.cs">
<DependentUpon>Edit.cshtml</DependentUpon>
</Compile>
</ItemGroup>
</Project>

5
modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj
View File

@ -11,14 +11,11 @@
<ItemGroup>
<EmbeddedResource Include="Volo\Docs\Localization\Domain\*.json" />
</ItemGroup>
<ItemGroup>
<Content Remove="Volo\Docs\Localization\Domain\*.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Octokit" Version="0.29.0" />
</ItemGroup>

2
modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Docs.EntityFrameworkCore</AssemblyName>
<PackageId>Volo.Docs.EntityFrameworkCore</PackageId>
<RootNamespace />

2
modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.HttpApi.Client</AssemblyName>
<PackageId>Volo.Docs.HttpApi.Client</PackageId>
<RootNamespace />

2
modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
View File

@ -6,6 +6,6 @@ namespace Volo.Docs
typeof(DocsApplicationContractsModule))]
public class DocsHttpApiClientModule : AbpModule
{
//TODO: Create client proxies
}
}

2
modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.HttpApi</AssemblyName>
<PackageId>Volo.Docs.HttpApi</PackageId>
<RootNamespace />

10
modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Volo.Docs.Web</AssemblyName>
<PackageId>Volo.Docs.Web</PackageId>
<OutputType>Library</OutputType>
@ -28,10 +28,6 @@
<EmbeddedResource Include="Pages\**\*.css" />
<EmbeddedResource Include="Pages\**\*.js" />
<EmbeddedResource Include="Localization\Resources\**\*.json" />
</ItemGroup>
<ItemGroup>
<Content Remove="wwwroot\**\*.*" />
<Content Remove="Pages\**\*.cshtml" />
<Content Remove="Pages\**\*.css" />
@ -44,8 +40,4 @@
<None Include="Properties\launchSettings.json" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
</Project>

4
modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
</ItemGroup>
<ItemGroup>

4
modules/docs/test/Volo.Docs.Application.Tests/Volo.Docs.Application.Tests.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
</ItemGroup>
<ItemGroup>

4
modules/docs/test/Volo.Docs.Domain.Tests/Volo.Docs.Domain.Tests.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
</ItemGroup>
<ItemGroup>

10
modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj
View File

@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.2.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0-preview9.19423.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview9.19423.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.0.0-preview9.19423.6" />
</ItemGroup>
<ItemGroup>

7
modules/docs/test/Volo.Docs.MongoDB.Tests/Volo.Docs.MongoDB.Tests.csproj
View File

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<IsPackable>false</IsPackable>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Mongo2Go" Version="2.2.11" />
</ItemGroup>

4
modules/docs/test/Volo.Docs.TestBase/Volo.Docs.TestBase.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />

Write Preview
Loading…
Cancel
Save