Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Commit

Permalink
feat: 项目复活并进行底层升级 (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
teacher-zhou authored May 22, 2023
2 parents 2e780e1 + 7f45e63 commit 5473386
Show file tree
Hide file tree
Showing 56 changed files with 239 additions and 553 deletions.
2 changes: 1 addition & 1 deletion TDesign.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{13ED86A3-CF19-4A3E-9A7C-B463221D6D1F}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
common.props = common.props
Contributing.md = Contributing.md
nuget.config = nuget.config
readme.md = readme.md
EndProjectSection
EndProject
Expand Down
36 changes: 36 additions & 0 deletions common.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project>
<PropertyGroup>
<LangVersion Condition="$(TargetFramework) == '.net6.0'">10</LangVersion>
<LangVersion Condition="$(TargetFramework) == '.net7.0'">11</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>
<Choose>
<When Condition="'$(Configuration)' == 'Debug'">
<PropertyGroup>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
</When>
<When Condition=" '$(Configuration)'=='Release' ">
<PropertyGroup>
<DebugSymbols>false</DebugSymbols>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageOutputPath>..\..\pack</PackageOutputPath>
</PropertyGroup>
</When>
</Choose>
<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions doc/TDesign.Docs.ServerSide/TDesign.Docs.ServerSide.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="../../common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>TDesign.Docs.ServerSide</RootNamespace>
Expand Down
5 changes: 1 addition & 4 deletions doc/TDesign.Docs.ServerSide/TDesign.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/TDesign.Docs.Shared/Components/Example.razor
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
bool Active = false;

string GetStyle() => Active ? "" : "display:none";
string CodeClass => HtmlHelper.Class.Append("content code")
string CodeClass => HtmlHelper.Instance.Class().Append("content code")
//.Append(Active, "code-collapse", "code-expand")
.ToString()
;

string BtnClass => HtmlHelper.Class.Append("action").Append("active", Active).ToString();
string BtnClass => HtmlHelper.Instance.Class().Append("action").Append("active", Active).ToString();

void ToogleCode()
{
Expand Down
4 changes: 1 addition & 3 deletions doc/TDesign.Docs.Shared/TDesign.Docs.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<Import Project="../../common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>TDesign.Docs.Shared</RootNamespace>
Expand All @@ -17,7 +16,6 @@
<ItemGroup>
<PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="MarkdigExtensions.SyntaxHighlighting" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 9 additions & 6 deletions doc/TDesign.Docs.WebAssembly/TDesign.Docs.WebAssembly.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<Import Project="../../common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<BlazorCacheBootResources>false</BlazorCacheBootResources>
Expand All @@ -16,11 +16,14 @@
<None Include="wwwroot\TDesign.xml" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" PrivateAssets="all" />
<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TDesign.Docs.Shared\TDesign.Docs.Shared.csproj" />
</ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions doc/TDesign.Docs.WebAssembly/wwwroot/TDesign.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 0 additions & 53 deletions doc/TDesignBlazor.Docs.Shared/Layouts/NavMenu.razor

This file was deleted.

Loading

0 comments on commit 5473386

Please sign in to comment.