diff --git a/Deploy/Prepare.ps1 b/Deploy/Prepare.ps1 index 254790a..4b927ad 100644 --- a/Deploy/Prepare.ps1 +++ b/Deploy/Prepare.ps1 @@ -9,5 +9,5 @@ $files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporte # CLI $files = @() $files += Get-Item -Path "$PSScriptRoot\..\License.txt" -$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net461\*" -Include "*.exe", "*.dll", "*.config" +$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net46\*" -Include "*.exe", "*.dll", "*.config" $files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.CLI.zip" -Force \ No newline at end of file diff --git a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj index f4dea64..fded59f 100644 --- a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj +++ b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj @@ -2,7 +2,7 @@ Exe - net461 + net46;netcoreapp2.1 2.11 Tyrrrz Copyright (c) Alexey Golub diff --git a/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj b/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj index e917ee7..8254869 100644 --- a/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj +++ b/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj @@ -1,7 +1,7 @@  - net461 + net46;netstandard2.0 diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj index e2f5338..ea27afc 100644 --- a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj +++ b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj @@ -1,7 +1,7 @@  - net461 + net46;netstandard2.0 @@ -15,10 +15,6 @@ - - - - diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj index 46df710..3222bc7 100644 --- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj +++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj @@ -8,13 +8,14 @@ WinExe DiscordChatExporter.Gui DiscordChatExporter - v4.6.1 + v4.6 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU @@ -145,6 +146,5 @@ 1.5.1 - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b51ad8c..dd25941 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,12 @@ -FROM mono:5 -WORKDIR /root/build -COPY DiscordChatExporter.sln favicon.ico ./ -COPY DiscordChatExporter.Core DiscordChatExporter.Core +FROM microsoft/dotnet:2.1-sdk AS build +WORKDIR /src COPY DiscordChatExporter.Core.Markdown DiscordChatExporter.Core.Markdown +COPY DiscordChatExporter.Core DiscordChatExporter.Core COPY DiscordChatExporter.Cli DiscordChatExporter.Cli -RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /t:Restore -RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /p:Configuration=Release +COPY DiscordChatExporter.sln favicon.ico ./ +RUN dotnet build DiscordChatExporter.Cli -c Release -f netcoreapp2.1 -FROM mono:5 -COPY --from=0 /root/build/DiscordChatExporter.Cli/bin/Release/net461 /root/bin -WORKDIR /a -ENTRYPOINT ["mono", "/root/bin/DiscordChatExporter.Cli.exe"] +FROM build AS app +WORKDIR /app +COPY --from=build /src/DiscordChatExporter.Cli/bin/Release/netcoreapp2.1 ./ +ENTRYPOINT ["dotnet", "DiscordChatExporter.Cli.dll"] \ No newline at end of file