Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dd35185

Browse files
maikebingmaikebing
committed
调整版本
1 parent ac1c7d8 commit dd35185

22 files changed

Lines changed: 46 additions & 39 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.cn-shanghai.aliyuncs.com/wzyuchen/aspnet:3.1-buster-slim AS base
1+
FROM registry.cn-shanghai.aliyuncs.com/wzyuchen/aspnet:5.0-buster-slim AS base
22
WORKDIR /app
33
EXPOSE 80
44
EXPOSE 443
55

6-
FROM registry.cn-shanghai.aliyuncs.com/wzyuchen/sdk:3.1-buster AS build
6+
FROM registry.cn-shanghai.aliyuncs.com/wzyuchen/sdk:5.00-buster AS build
77
COPY . .
88
RUN dotnet restore "src/Samples/Element/Element.ServerRender/Element.ServerRender.csproj"
99
RUN dotnet build "src/Samples/Element/Element.ServerRender/Element.ServerRender.csproj" -c Release -o /app/build

‎Element-Blazor.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{2A9865EB-C969-47C7-BC21-E870F75C3AC4}"
1313
ProjectSection(SolutionItems) = preProject
1414
docker-compose.yml = docker-compose.yml
15-
Dockerfile = Dockerfile
1615
Jenkinsfile = Jenkinsfile
1716
kubernetes.yml = kubernetes.yml
1817
LOGO.png = LOGO.png

‎src/Admin/Admin.ClientRender/Element.Admin.ClientRender.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<Version>0.0.1</Version>
66
<Authors>wzxinchen;Element-Blazor</Authors>
77
<Company>Element-Blazor</Company>
@@ -18,7 +18,6 @@
1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
2221
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
2322
</ItemGroup>
2423

‎src/Admin/Admin.ServerRender/Dockerfile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
2+
3+
FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
4+
WORKDIR /app
5+
EXPOSE 80
6+
EXPOSE 443
7+
8+
FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
9+
WORKDIR /src
10+
COPY ["src/Admin/Admin.ServerRender/Element.Admin.ServerRender.csproj", "src/Admin/Admin.ServerRender/"]
11+
COPY ["src/Admin/Admin/Element.Admin.csproj", "src/Admin/Admin/"]
12+
COPY ["src/Markdown/Element.Markdown.csproj", "src/Markdown/"]
13+
COPY ["src/Components/Element.csproj", "src/Components/"]
14+
RUN dotnet restore "src/Admin/Admin.ServerRender/Element.Admin.ServerRender.csproj"
15+
COPY . .
16+
WORKDIR "/src/src/Admin/Admin.ServerRender"
17+
RUN dotnet build "Element.Admin.ServerRender.csproj" -c Release -o /app/build
18+
19+
FROM build AS publish
20+
RUN dotnet publish "Element.Admin.ServerRender.csproj" -c Release -o /app/publish
21+
22+
FROM base AS final
23+
WORKDIR /app
24+
COPY --from=publish /app/publish .
25+
ENTRYPOINT ["dotnet", "Element.Admin.ServerRender.dll"]

‎src/Admin/Admin.ServerRender/Element.Admin.ServerRender.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<ApplicationIcon />
66
<OutputType>Library</OutputType>
77
<IsPackable>true</IsPackable>
@@ -18,12 +18,14 @@
1818
<Version>0.0.2.1</Version>
1919
<AssemblyVersion>0.0.2.0</AssemblyVersion>
2020
<FileVersion>0.0.2.0</FileVersion>
21+
<UserSecretsId>12e18c4b-b671-4824-8947-019561d8af8b</UserSecretsId>
22+
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
23+
<DockerfileContext>..\..\..</DockerfileContext>
2124
</PropertyGroup>
2225

2326
<ItemGroup>
2427
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
28+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
2729
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
2830
</ItemGroup>
2931

‎src/Admin/Admin/Element.Admin.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net5</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<RestoreAdditionalProjectSources>
66
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
77
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
@@ -19,8 +19,6 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<None Include="Element.Admin.csproj" />
23-
<None Include="Element.Admin.csproj.user" />
2422
<None Include="..\..\..\LOGO.png">
2523
<Pack>True</Pack>
2624
<PackagePath></PackagePath>

‎src/Components/BForm.ControlMap.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Element.ControlConfigs;
22
using Element.ControlRender;
33
using Element.ControlRenders;
4-
using Microsoft.AspNetCore.Mvc;
54
using Microsoft.Extensions.DependencyInjection;
65
using System;
76
using System.Collections;

‎src/Components/BForm.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Element.ControlRenders;
22
using Microsoft.AspNetCore.Components;
3-
using Microsoft.AspNetCore.Http.Features.Authentication;
43
using Microsoft.Extensions.DependencyInjection;
54
using System;
65
using System.Collections.Generic;

‎src/Components/BTable.razor.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
using Microsoft.AspNetCore.Components.Web;
99
using Microsoft.Extensions.DependencyInjection;
1010
using Microsoft.JSInterop;
11-
using Newtonsoft.Json;
12-
using Newtonsoft.Json.Linq;
1311
using System;
1412
using System.Collections;
1513
using System.Collections.Generic;

‎src/Components/BTransition.razor.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.AspNetCore.Components;
2-
using Microsoft.AspNetCore.Mvc.Internal;
32
using Microsoft.JSInterop;
43
using System;
54
using System.Collections.Generic;

0 commit comments

Comments
 (0)