From 61d0ddeced2205482bdcbb501260df7b75a61cf3 Mon Sep 17 00:00:00 2001
From: Tyrrrz <tyrrrz@gmail.com>
Date: Thu, 10 Dec 2020 16:52:05 +0200
Subject: [PATCH] Update project structure

---
 DiscordChatExporter.props => Directory.Build.props         | 0
 DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj     | 3 +--
 .../DiscordChatExporter.Domain.csproj                      | 1 -
 DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj     | 7 +++----
 DiscordChatExporter.sln                                    | 2 +-
 Dockerfile                                                 | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 rename DiscordChatExporter.props => Directory.Build.props (100%)

diff --git a/DiscordChatExporter.props b/Directory.Build.props
similarity index 100%
rename from DiscordChatExporter.props
rename to Directory.Build.props
diff --git a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
index 0f1d0c4..48d858a 100644
--- a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
+++ b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -7,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="1.5.0" />
+    <PackageReference Include="CliFx" Version="1.6.0" />
     <PackageReference Include="Gress" Version="1.2.0" />
     <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
diff --git a/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj b/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj
index 1eb9ba0..4c9f7c7 100644
--- a/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj
+++ b/DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
 
   <ItemGroup>
     <PackageReference Include="JsonExtensions" Version="1.0.1" />
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
index b2663e1..5f7a73f 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -17,12 +16,12 @@
     <PackageReference Include="MaterialDesignColors" Version="1.2.2" />
     <PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
-    <PackageReference Include="Ookii.Dialogs.Wpf" Version="1.1.0" />
+    <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
     <PackageReference Include="Onova" Version="2.6.2" />
-    <PackageReference Include="Stylet" Version="1.3.4" />
+    <PackageReference Include="Stylet" Version="1.3.5" />
     <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.10" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.3.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DiscordChatExporter.sln b/DiscordChatExporter.sln
index 2bc3913..54c906d 100644
--- a/DiscordChatExporter.sln
+++ b/DiscordChatExporter.sln
@@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Changelog.md = Changelog.md
 		License.txt = License.txt
 		Readme.md = Readme.md
-		DiscordChatExporter.props = DiscordChatExporter.props
+		Directory.Build.props = Directory.Build.props
 		Dockerfile = Dockerfile
 	EndProjectSection
 EndProject
diff --git a/Dockerfile b/Dockerfile
index f4c59df..509059d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
 
 COPY favicon.ico ./
-COPY DiscordChatExporter.props ./
+COPY Directory.Build.props ./
 COPY DiscordChatExporter.Domain DiscordChatExporter.Domain
 COPY DiscordChatExporter.Cli DiscordChatExporter.Cli