From 702405f3b7ba6a6f2868eced3cb1a00a46a4a326 Mon Sep 17 00:00:00 2001 From: Christian Specht Date: Mon, 20 Jan 2020 10:27:08 +0100 Subject: [PATCH 1/3] update to .NET Core 3.1 (fixes #37) --- appveyor.yml | 2 +- .../ScmBackup.Tests.Integration.csproj | 2 +- src/ScmBackup.Tests/ScmBackup.Tests.csproj | 2 +- src/ScmBackup/ScmBackup.bat | 2 -- src/ScmBackup/ScmBackup.csproj | 5 +---- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 src/ScmBackup/ScmBackup.bat diff --git a/appveyor.yml b/appveyor.yml index 86a207b..a2f74b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ test: off artifacts: - path: release\scm-backup-*.zip name: Application -- path: src\ScmBackup.Tests.Integration\bin\Release\netcoreapp2.1\*.log +- path: src\ScmBackup.Tests.Integration\bin\Release\netcoreapp3.1\*.log name: Integration Test Logfile assembly_info: patch: true diff --git a/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj b/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj index f93b6f7..f2b3b67 100644 --- a/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj +++ b/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 ScmBackup.Tests.Integration ScmBackup.Tests.Integration true diff --git a/src/ScmBackup.Tests/ScmBackup.Tests.csproj b/src/ScmBackup.Tests/ScmBackup.Tests.csproj index 5eea1f3..aa920b5 100644 --- a/src/ScmBackup.Tests/ScmBackup.Tests.csproj +++ b/src/ScmBackup.Tests/ScmBackup.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 ScmBackup.Tests ScmBackup.Tests true diff --git a/src/ScmBackup/ScmBackup.bat b/src/ScmBackup/ScmBackup.bat deleted file mode 100644 index 3b08c05..0000000 --- a/src/ScmBackup/ScmBackup.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -dotnet ScmBackup.dll \ No newline at end of file diff --git a/src/ScmBackup/ScmBackup.csproj b/src/ScmBackup/ScmBackup.csproj index b7307b6..1aa47e2 100644 --- a/src/ScmBackup/ScmBackup.csproj +++ b/src/ScmBackup/ScmBackup.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 ScmBackup Exe ScmBackup @@ -20,9 +20,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest From b90151a4537056a5edac361660889be0fdc43fec Mon Sep 17 00:00:00 2001 From: Christian Specht Date: Mon, 20 Jan 2020 12:45:34 +0100 Subject: [PATCH 2/3] update all NuGet packages, resolve warning --- .../ScmBackup.Tests.Integration.csproj | 11 +++++++---- src/ScmBackup.Tests/ScmBackup.Tests.csproj | 13 ++++++++----- src/ScmBackup/ConfigReader.cs | 2 +- src/ScmBackup/ScmBackup.csproj | 12 ++++++------ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj b/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj index f2b3b67..6b2c447 100644 --- a/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj +++ b/src/ScmBackup.Tests.Integration/ScmBackup.Tests.Integration.csproj @@ -40,10 +40,13 @@ - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/ScmBackup.Tests/ScmBackup.Tests.csproj b/src/ScmBackup.Tests/ScmBackup.Tests.csproj index aa920b5..a1200f8 100644 --- a/src/ScmBackup.Tests/ScmBackup.Tests.csproj +++ b/src/ScmBackup.Tests/ScmBackup.Tests.csproj @@ -21,11 +21,14 @@ - - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/ScmBackup/ConfigReader.cs b/src/ScmBackup/ConfigReader.cs index e89f912..500e6b2 100644 --- a/src/ScmBackup/ConfigReader.cs +++ b/src/ScmBackup/ConfigReader.cs @@ -25,7 +25,7 @@ public Config ReadConfig() this.config = new Config(); var input = File.ReadAllText(this.ConfigFileName); - var deserializer = new DeserializerBuilder().WithNamingConvention(new CamelCaseNamingConvention()).Build(); + var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance).Build(); this.config = deserializer.Deserialize(input); } diff --git a/src/ScmBackup/ScmBackup.csproj b/src/ScmBackup/ScmBackup.csproj index 1aa47e2..e2fc7fa 100644 --- a/src/ScmBackup/ScmBackup.csproj +++ b/src/ScmBackup/ScmBackup.csproj @@ -26,12 +26,12 @@ - - - - - - + + + + + + From 2fd78f984d259e6667d5eced7327448dac34c78e Mon Sep 17 00:00:00 2001 From: Christian Specht Date: Mon, 20 Jan 2020 22:28:43 +0100 Subject: [PATCH 3/3] use newer AppVeyor image (because the old one doesn't have .NET Core installed) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a2f74b0..3ac2c56 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: "{build}" -image: Visual Studio 2017 +image: Visual Studio 2019 branches: only: - master