From fa4c06b72266a1a1c4af1c1c1135f33f43368eac Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 13 Aug 2021 12:02:08 +0200 Subject: [PATCH 1/2] Move common properties to `Directory.Build.props` --- Directory.Build.props | 28 +++++++++++++++++++ LfMerge.TestApp/LfMerge.TestApp.csproj | 24 ++-------------- LfMerge.sln | 1 + src/FixFwData/FixFwData.csproj | 27 +----------------- .../LfMerge.Core.Tests.csproj | 23 --------------- src/LfMerge.Core/LfMerge.Core.csproj | 25 ----------------- src/LfMerge.Tests/LfMerge.Tests.csproj | 24 ---------------- src/LfMerge/LfMerge.csproj | 27 +----------------- src/LfMergeAuxTool/LfMergeAuxTool.csproj | 24 ---------------- .../LfMergeQueueManager.csproj | 24 ---------------- 10 files changed, 33 insertions(+), 194 deletions(-) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..5bab5019 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,28 @@ + + + net462 + Debug;Release + SIL International + SIL International + LfMerge + Copyright © 2010-2021 SIL International + MIT + https://github.com/sillsdev/LfMerge + false + ../../output/$(Configuration) + ../../output + true + ../../LfMerge.snk + true + snupkg + true + true + + false + ../../CHANGELOG.md + true + TRACE;DEBUG;DBVERSION_7000072 + false + + diff --git a/LfMerge.TestApp/LfMerge.TestApp.csproj b/LfMerge.TestApp/LfMerge.TestApp.csproj index c18d8b87..efe3ae50 100644 --- a/LfMerge.TestApp/LfMerge.TestApp.csproj +++ b/LfMerge.TestApp/LfMerge.TestApp.csproj @@ -1,33 +1,13 @@  - net462 - Exe LfMerge.TestApp - Debug;Release LfMerge.TestApp - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false + Exe ../output/$(Configuration) ../output - true ../LfMerge.snk - true - snupkg - true - true - - - false - false - true - DEBUG + ../CHANGELOG.md diff --git a/LfMerge.sln b/LfMerge.sln index e7d87188..5c83175f 100644 --- a/LfMerge.sln +++ b/LfMerge.sln @@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution build\NuGet.targets = build\NuGet.targets README.md = README.md CHANGELOG.md = CHANGELOG.md + Directory.Build.props = Directory.Build.props EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LfMerge", "src\LfMerge\LfMerge.csproj", "{0E79BC8D-9AE4-4B2C-ACFB-D8C1B2BC3D4F}" diff --git a/src/FixFwData/FixFwData.csproj b/src/FixFwData/FixFwData.csproj index 8730e0c0..905f97ba 100644 --- a/src/FixFwData/FixFwData.csproj +++ b/src/FixFwData/FixFwData.csproj @@ -1,35 +1,10 @@  - net462 - WinExe FixFwData - Debug;Release FixFwData - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - ../../CHANGELOG.md + WinExe LINUX - true - DEBUG;TRACE;DBVERSION_7000072; - false diff --git a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj index 0401d5e6..468c919c 100644 --- a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj +++ b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj @@ -1,31 +1,8 @@ - net462 LfMerge.Core.Tests - Debug;Release LfMerge.Core.Tests - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - false - TRACE;DEBUG;DBVERSION_7000072 diff --git a/src/LfMerge.Core/LfMerge.Core.csproj b/src/LfMerge.Core/LfMerge.Core.csproj index 59101c2e..dd1ab1f7 100644 --- a/src/LfMerge.Core/LfMerge.Core.csproj +++ b/src/LfMerge.Core/LfMerge.Core.csproj @@ -1,33 +1,8 @@ - net462 LfMerge.Core - Debug;Release LfMerge.Core - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - ../../CHANGELOG.md - true - TRACE;DEBUG;DBVERSION_7000072 - false diff --git a/src/LfMerge.Tests/LfMerge.Tests.csproj b/src/LfMerge.Tests/LfMerge.Tests.csproj index 60a47007..8a9bb234 100644 --- a/src/LfMerge.Tests/LfMerge.Tests.csproj +++ b/src/LfMerge.Tests/LfMerge.Tests.csproj @@ -1,32 +1,8 @@  - net462 LfMerge.Tests - Debug;Release LfMerge.Tests - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - false - true - TRACE;DEBUG;DBVERSION_7000072 diff --git a/src/LfMerge/LfMerge.csproj b/src/LfMerge/LfMerge.csproj index e7285af1..d988117e 100644 --- a/src/LfMerge/LfMerge.csproj +++ b/src/LfMerge/LfMerge.csproj @@ -1,35 +1,10 @@  - net462 - Exe LfMerge - Debug;Release LfMerge - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - ../../CHANGELOG.md + Exe LINUX - true - DEBUG;TRACE;$(DefinePlatformConstants) - false diff --git a/src/LfMergeAuxTool/LfMergeAuxTool.csproj b/src/LfMergeAuxTool/LfMergeAuxTool.csproj index af35d498..20a89b07 100644 --- a/src/LfMergeAuxTool/LfMergeAuxTool.csproj +++ b/src/LfMergeAuxTool/LfMergeAuxTool.csproj @@ -1,32 +1,8 @@  - net462 LfMergeAuxTool - Debug;Release LfMergeAuxTool - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - false - true - TRACE;DEBUG;DBVERSION_7000072 Exe diff --git a/src/LfMergeQueueManager/LfMergeQueueManager.csproj b/src/LfMergeQueueManager/LfMergeQueueManager.csproj index 7478850c..591c5d66 100644 --- a/src/LfMergeQueueManager/LfMergeQueueManager.csproj +++ b/src/LfMergeQueueManager/LfMergeQueueManager.csproj @@ -1,32 +1,8 @@  - net462 LfMerge.QueueManager - Debug;Release LfMergeQueueManager - SIL International - SIL International - LfMerge - Copyright © 2010-2020 SIL International - MIT - https://github.com/sillsdev/LfMerge - false - ../../output/$(Configuration) - ../../output - true - ../../LfMerge.snk - true - snupkg - true - true - - - false - false - true - TRACE;DEBUG;DBVERSION_7000072 Exe From f084ff475a99f3b9537131b5f8133194aa4750bb Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 13 Aug 2021 12:14:47 +0200 Subject: [PATCH 2/2] Update dependencies This change updates the libpalaso* dependencies to the latest released versions. --- build/LfMerge.proj | 1 - src/FixFwData/FixFwData.csproj | 2 +- src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj | 6 +++--- src/LfMerge.Core/LfMerge.Core.csproj | 12 ++++++------ src/LfMerge.Tests/LfMerge.Tests.csproj | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build/LfMerge.proj b/build/LfMerge.proj index 2353be50..9eeec498 100644 --- a/build/LfMerge.proj +++ b/build/LfMerge.proj @@ -9,7 +9,6 @@ Release true false - 2.6.4 true false $(RootDir)/output/$(Configuration)/TestResults.xml diff --git a/src/FixFwData/FixFwData.csproj b/src/FixFwData/FixFwData.csproj index 905f97ba..948d311d 100644 --- a/src/FixFwData/FixFwData.csproj +++ b/src/FixFwData/FixFwData.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj index 468c919c..407a804a 100644 --- a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj +++ b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/LfMerge.Core/LfMerge.Core.csproj b/src/LfMerge.Core/LfMerge.Core.csproj index dd1ab1f7..9ad9bd82 100644 --- a/src/LfMerge.Core/LfMerge.Core.csproj +++ b/src/LfMerge.Core/LfMerge.Core.csproj @@ -8,16 +8,16 @@ - + - - - - - + + + + + diff --git a/src/LfMerge.Tests/LfMerge.Tests.csproj b/src/LfMerge.Tests/LfMerge.Tests.csproj index 8a9bb234..0019197e 100644 --- a/src/LfMerge.Tests/LfMerge.Tests.csproj +++ b/src/LfMerge.Tests/LfMerge.Tests.csproj @@ -8,7 +8,7 @@ - +