From 632b9f953b66bc5b0bed7ff91ab5ac4b837b957b Mon Sep 17 00:00:00 2001
From: Alexey Golub <tyrrrz@gmail.com>
Date: Sun, 1 Dec 2019 16:00:45 +0200
Subject: [PATCH] Use shared props file

---
 .../DiscordChatExporter.Cli.csproj                   |  5 +----
 .../DiscordChatExporter.Core.Markdown.csproj         |  2 +-
 .../DiscordChatExporter.Core.Models.csproj           |  2 +-
 .../DiscordChatExporter.Core.Rendering.csproj        |  2 +-
 .../DiscordChatExporter.Core.Services.csproj         |  2 +-
 .../DiscordChatExporter.Gui.csproj                   |  5 +----
 DiscordChatExporter.props                            | 11 +++++++++++
 UpdateVersion.ps1                                    | 12 ------------
 8 files changed, 17 insertions(+), 24 deletions(-)
 create mode 100644 DiscordChatExporter.props
 delete mode 100644 UpdateVersion.ps1

diff --git a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
index 5a3d1ba..51aa673 100644
--- a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
+++ b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Version>2.15</Version>
-    <Company>Tyrrrz</Company>
-    <Copyright>Copyright (c) Alexey Golub</Copyright>
-    <Nullable>enable</Nullable>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
diff --git a/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj b/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj
index 70a6a23..6e070c6 100644
--- a/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj
+++ b/DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj b/DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj
index 70a6a23..6e070c6 100644
--- a/DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj
+++ b/DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DiscordChatExporter.Core.Rendering/DiscordChatExporter.Core.Rendering.csproj b/DiscordChatExporter.Core.Rendering/DiscordChatExporter.Core.Rendering.csproj
index 3c74320..e1dc33d 100644
--- a/DiscordChatExporter.Core.Rendering/DiscordChatExporter.Core.Rendering.csproj
+++ b/DiscordChatExporter.Core.Rendering/DiscordChatExporter.Core.Rendering.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj b/DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj
index 4b7ef06..7b9fc03 100644
--- a/DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj
+++ b/DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
index 51f0447..3717383 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>DiscordChatExporter</AssemblyName>
-    <Version>2.15</Version>
-    <Company>Tyrrrz</Company>
-    <Copyright>Copyright (c) Alexey Golub</Copyright>
-    <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
diff --git a/DiscordChatExporter.props b/DiscordChatExporter.props
new file mode 100644
index 0000000..8031f63
--- /dev/null
+++ b/DiscordChatExporter.props
@@ -0,0 +1,11 @@
+<Project>
+
+  <PropertyGroup>
+    <Version>2.15</Version>
+    <Company>Tyrrrz</Company>
+    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/UpdateVersion.ps1 b/UpdateVersion.ps1
deleted file mode 100644
index e1f6e28..0000000
--- a/UpdateVersion.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param([string] $newVersion)
-
-function Replace-TextInFile {
-    param([string] $filePath, [string] $pattern, [string] $replacement)
-
-    $content = [IO.File]::ReadAllText($filePath)
-    $content = [Text.RegularExpressions.Regex]::Replace($content, $pattern, $replacement)
-    [IO.File]::WriteAllText($filePath, $content, [Text.Encoding]::UTF8)
-}
-
-Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" '(?<=<Version>)(.*?)(?=</Version>)' $newVersion
-Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj" '(?<=<Version>)(.*?)(?=</Version>)' $newVersion
\ No newline at end of file