From d1fa485e44dc285ede03e65840d8b70751aa935b Mon Sep 17 00:00:00 2001 From: Ivandro Jao Date: Sun, 1 Sep 2024 19:49:14 +0100 Subject: [PATCH 1/6] Switch to PackageReference and update binding redirect Replaced `packages.config` with `PackageReference` in `Test.csproj` for streamlined package management. Also updated the `System.Net.Http` binding redirect in `app.config` from version `4.2.0.0` to `4.1.2.0`. Signed-off-by: Ivandro Jao --- src/Test/Test.csproj | 9 +++++---- src/Test/app.config | 2 +- src/Test/packages.config | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 src/Test/packages.config diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index 95cffea9e..0b248e33a 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -43,9 +43,6 @@ False - - ..\..\packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll - @@ -194,7 +191,6 @@ - @@ -206,6 +202,11 @@ SubtitleEdit + + + + + diff --git a/src/Test/app.config b/src/Test/app.config index 0e87a1799..d78f94066 100644 --- a/src/Test/app.config +++ b/src/Test/app.config @@ -24,7 +24,7 @@ - + diff --git a/src/Test/packages.config b/src/Test/packages.config deleted file mode 100644 index a629809b8..000000000 --- a/src/Test/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From abd74866bf9589457b7201da4ce8ef9e911f1097 Mon Sep 17 00:00:00 2001 From: Ivandro Jao Date: Sun, 1 Sep 2024 20:19:54 +0100 Subject: [PATCH 2/6] Add RuntimeIdentifier to Test.csproj Removed the empty TargetFrameworkProfile and NuGetPackageImportStamp elements and added the RuntimeIdentifier property set to 'win'. This change specifies the runtime environment for the project, ensuring it targets the Windows platform explicitly. Signed-off-by: Ivandro Jao --- src/Test/Test.csproj | 446 +++++++++++++++++++++---------------------- 1 file changed, 222 insertions(+), 224 deletions(-) diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index 0b248e33a..7a6902f35 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,225 +1,223 @@ - - - - - Properties - Test - Debug - 512 - Library - AnyCPU - {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E} - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Test - v4.8 - - - - - - AllRules.ruleset - true - full - DEBUG;TRACE - prompt - false - bin\Debug\ - AnyCPU - 4 - false - - - AllRules.ruleset - pdbonly - TRACE - prompt - true - bin\Release\ - AnyCPU - 4 - false - - - - False - - - - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - - - - {d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f} - LibSE - - - {511a5b59-1c35-4719-8536-23b19af9b21a} - SubtitleEdit - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + + Properties + Test + Debug + 512 + Library + AnyCPU + {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E} + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Test + v4.8 + win + + + AllRules.ruleset + true + full + DEBUG;TRACE + prompt + false + bin\Debug\ + AnyCPU + 4 + false + + + AllRules.ruleset + pdbonly + TRACE + prompt + true + bin\Release\ + AnyCPU + 4 + false + + + + False + + + + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + + + + {d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f} + LibSE + + + {511a5b59-1c35-4719-8536-23b19af9b21a} + SubtitleEdit + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file From d882c7a0b36e578fc3b542389f793f493939fc24 Mon Sep 17 00:00:00 2001 From: Ivandro Jao Date: Sun, 1 Sep 2024 20:21:19 +0100 Subject: [PATCH 3/6] Reformat project file to improve readability Replaced tabs with spaces and adjusted XML formatting in Test.csproj to enhance readability and maintain consistency. No functional changes were made to the project configuration. Signed-off-by: Ivandro Jao --- src/Test/Test.csproj | 436 +++++++++++++++++++++---------------------- 1 file changed, 218 insertions(+), 218 deletions(-) diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index 7a6902f35..79f37b94d 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,223 +1,223 @@  - - - Properties - Test - Debug - 512 - Library - AnyCPU - {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E} - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Test - v4.8 - win - - - AllRules.ruleset - true - full - DEBUG;TRACE - prompt - false - bin\Debug\ - AnyCPU - 4 - false - - - AllRules.ruleset - pdbonly - TRACE - prompt - true - bin\Release\ - AnyCPU - 4 - false - - - - False - - - - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - - - - {d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f} - LibSE - - - {511a5b59-1c35-4719-8536-23b19af9b21a} - SubtitleEdit - - - - - - - - - - + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Properties + Test + Debug + 512 + Library + AnyCPU + {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E} + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Test + v4.8 + win - - - + + AllRules.ruleset + true + full + DEBUG;TRACE + prompt + false + bin\Debug\ + AnyCPU + 4 + false + + + AllRules.ruleset + pdbonly + TRACE + prompt + true + bin\Release\ + AnyCPU + 4 + false + + + + False + + + + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + + + + {d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f} + LibSE + + + {511a5b59-1c35-4719-8536-23b19af9b21a} + SubtitleEdit + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file From f5392b2394947782296992090eae0ebb3c4d5d6f Mon Sep 17 00:00:00 2001 From: Ivandro Jao Date: Tue, 3 Sep 2024 14:49:11 +0100 Subject: [PATCH 4/6] Use centralized package management Refactor project files to use Directory.Packages.props for centralized NuGet package management, making dependency updates easier and more consistent across projects. Removed explicit version specifications from individual project files. Signed-off-by: Ivandro Jao --- Directory.Packages.props | 20 ++++++++++++++++++++ SubtitleEdit.sln | 1 + src/Test/Test.csproj | 8 +++++--- src/ui/SubtitleEdit.csproj | 20 ++++++++++---------- 4 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..55b2fb12e --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,20 @@ + + + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubtitleEdit.sln b/SubtitleEdit.sln index 8dd370fe1..db5fec9ff 100644 --- a/SubtitleEdit.sln +++ b/SubtitleEdit.sln @@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution LanguageBaseEnglish.xml = LanguageBaseEnglish.xml LICENSE.txt = LICENSE.txt README.md = README.md + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSE", "src\libse\LibSE.csproj", "{D6F64CD3-C3EA-4B36-B575-9B3B8A3CA13F}" diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index 79f37b94d..57087148c 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -201,18 +201,20 @@ - - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. +