Use shared props file

5 years ago · 632b9f953b
parent 9a52c6a6f6
commit 632b9f953b
8 changed files with 17 additions and 24 deletions
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/DiscordChatExporter.props
+++ 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>
--- a/UpdateVersion.ps1
+++ b/UpdateVersion.ps1
@ -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