This commit is contained in:
Gui.H 2022-05-11 11:06:05 +08:00
parent a31109e72f
commit 76cc6933a9
3 changed files with 36 additions and 40 deletions

View File

@ -8,8 +8,8 @@ EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src WORKDIR /src
COPY ["FastTunnel.Server/FastTunnel.Server.csproj", "FastTunnel.Server/"] COPY ["FastTunnel.Server/FastTunnel.Server.csproj", "FastTunnel.Server/"]
COPY ["FastTunnel.Core/FastTunnel.Core.csproj", "FastTunnel.Core/"]
COPY ["FastTunnel.Api/FastTunnel.Api.csproj", "FastTunnel.Api/"] COPY ["FastTunnel.Api/FastTunnel.Api.csproj", "FastTunnel.Api/"]
COPY ["FastTunnel.Hosting/FastTunnel.Hosting.csproj", "FastTunnel.Hosting/"]
RUN dotnet restore "FastTunnel.Server/FastTunnel.Server.csproj" RUN dotnet restore "FastTunnel.Server/FastTunnel.Server.csproj"
COPY . . COPY . .
WORKDIR "/src/FastTunnel.Server" WORKDIR "/src/FastTunnel.Server"

View File

@ -1,46 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <ItemGroup>
<DefineConstants>DEBUG</DefineConstants> <Compile Remove="logs\**" />
<Nullable>enable</Nullable> <Content Remove="logs\**" />
</PropertyGroup> <EmbeddedResource Remove="logs\**" />
<None Remove="logs\**" />
</ItemGroup>
<PropertyGroup> <ItemGroup>
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild> <Compile Remove="FastTunnelConnectionMiddleware.cs" />
</PropertyGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="logs\**" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
<Content Remove="logs\**" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
<EmbeddedResource Remove="logs\**" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22175.4" />
<None Remove="logs\**" /> <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-preview.3.22175.4" />
</ItemGroup> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
</ItemGroup>
<ItemGroup> <ItemGroup Condition="'$(Configuration)'=='Debug'">
<Compile Remove="FastTunnelConnectionMiddleware.cs" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
</ItemGroup> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" />
<ProjectReference Include="..\FastTunnel.Hosting\FastTunnel.Hosting.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" /> <None Update="uninstall.bat">
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" /> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22175.4" /> </None>
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-preview.3.22175.4" /> </ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Debug'">
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" />
<ProjectReference Include="..\FastTunnel.Hosting\FastTunnel.Hosting.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="uninstall.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project> </Project>

View File

@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig .editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
Dockerfile = Dockerfile
.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml .github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
EndProjectSection EndProjectSection
EndProject EndProject