From 412be3c0b8dce8834a4fec888016c1f52b6ed30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stano=20Gabo=20Pe=C5=A5ko?= Date: Fri, 15 Nov 2024 11:26:53 +0100 Subject: [PATCH 1/2] Fix tests --- .../Services/FakeMigrationToolVersionInfo.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/MigrationTools.Shadows/Services/FakeMigrationToolVersionInfo.cs b/src/MigrationTools.Shadows/Services/FakeMigrationToolVersionInfo.cs index 3f4c2acf9..bffc3fbe8 100644 --- a/src/MigrationTools.Shadows/Services/FakeMigrationToolVersionInfo.cs +++ b/src/MigrationTools.Shadows/Services/FakeMigrationToolVersionInfo.cs @@ -9,7 +9,7 @@ namespace MigrationTools.Services.Shadows { - public class FakeMigrationToolVersionInfo : MigrationToolVersionInfo + public class FakeMigrationToolVersionInfo : IMigrationToolVersionInfo { public FakeMigrationToolVersionInfo() { @@ -23,5 +23,9 @@ public FakeMigrationToolVersionInfo(string productVersion, string fileVersion, s FileVersion = fileVersion; GitTag = gitTag; } + + public string ProductVersion { get; set; } + public string FileVersion { get; set; } + public string GitTag { get; set; } } } From 8a07e3420153ea26f9ddf770cb1a07a4d3387134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stano=20Gabo=20Pe=C5=A5ko?= Date: Fri, 15 Nov 2024 10:28:56 +0100 Subject: [PATCH 2/2] Use central package management Revert all --- .editorconfig | 2 + Directory.Build.props | 11 ++-- Directory.Packages.props | 64 +++++++++++++++++++ MigrationTools.sln | 1 + docs/MigrationTools.Documentation.csproj | 6 +- ...ools.Clients.AzureDevops.Rest.Tests.csproj | 17 ++--- ...ationTools.Clients.AzureDevops.Rest.csproj | 18 ++---- ...ationTools.Clients.FileSystem.Tests.csproj | 15 ++--- .../MigrationTools.Clients.FileSystem.csproj | 16 ++--- ...nTools.Clients.TfsObjectModel.Tests.csproj | 25 +++----- ...grationTools.Clients.TfsObjectModel.csproj | 30 ++++----- .../MigrationTools.ConsoleCore.csproj | 12 ++-- .../ClassDataLoader.cs | 2 +- ...MigrationTools.ConsoleDataGenerator.csproj | 10 +-- .../MigrationTools.ConsoleFull.csproj | 29 ++++----- .../MigrationTools.Host.Tests.csproj | 13 ++-- .../MigrationTools.Host.csproj | 58 ++++++++--------- .../MigrationTools.Shadows.csproj | 16 ++--- .../MigrationTools.Telemetery.csproj | 23 ++++--- .../MigrationTools.Tests.csproj | 17 ++--- src/MigrationTools/MigrationTools.csproj | 56 ++++++++-------- 21 files changed, 221 insertions(+), 220 deletions(-) create mode 100644 Directory.Packages.props diff --git a/.editorconfig b/.editorconfig index 4a3772617..2d365624a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -24,10 +24,12 @@ insert_final_newline = true [*.csproj] tab_width = 2 indent_size = 2 +indent_style = space [*.props] tab_width = 2 indent_size = 2 +indent_style = space [*.cs] indent_style = space diff --git a/Directory.Build.props b/Directory.Build.props index 2d94db4f3..94f62a042 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,16 +1,17 @@ - 0.0.0.0 - 0.0.0.0 - 0.0.0-local + 0.0.0.0 + 0.0.0.0 + 0.0.0-local Martin Hinshelwood naked Agility with Martin Hinshelwood MigrationTools.CommandLine - default + default 1701;1702;1591 + true - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..3a33d8fc9 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MigrationTools.sln b/MigrationTools.sln index 9bff12c56..9c6ce09ee 100644 --- a/MigrationTools.sln +++ b/MigrationTools.sln @@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore appsettings.json = appsettings.json Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props GitVersion.yml = GitVersion.yml mkdocs.yml = mkdocs.yml README.md = README.md diff --git a/docs/MigrationTools.Documentation.csproj b/docs/MigrationTools.Documentation.csproj index 26b6e6b2e..743ca7c87 100644 --- a/docs/MigrationTools.Documentation.csproj +++ b/docs/MigrationTools.Documentation.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -10,8 +10,4 @@ - - - - diff --git a/src/MigrationTools.Clients.AzureDevops.Rest.Tests/MigrationTools.Clients.AzureDevops.Rest.Tests.csproj b/src/MigrationTools.Clients.AzureDevops.Rest.Tests/MigrationTools.Clients.AzureDevops.Rest.Tests.csproj index f9d87d00d..01aae5228 100644 --- a/src/MigrationTools.Clients.AzureDevops.Rest.Tests/MigrationTools.Clients.AzureDevops.Rest.Tests.csproj +++ b/src/MigrationTools.Clients.AzureDevops.Rest.Tests/MigrationTools.Clients.AzureDevops.Rest.Tests.csproj @@ -1,8 +1,7 @@ - + net8.0 - false @@ -11,11 +10,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -27,8 +26,4 @@ - - - - diff --git a/src/MigrationTools.Clients.AzureDevops.Rest/MigrationTools.Clients.AzureDevops.Rest.csproj b/src/MigrationTools.Clients.AzureDevops.Rest/MigrationTools.Clients.AzureDevops.Rest.csproj index 8a721e1b7..0defcf54b 100644 --- a/src/MigrationTools.Clients.AzureDevops.Rest/MigrationTools.Clients.AzureDevops.Rest.csproj +++ b/src/MigrationTools.Clients.AzureDevops.Rest/MigrationTools.Clients.AzureDevops.Rest.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net8.0 + netstandard2.0;net8.0 MigrationTools.Clients.AzureDevops.Rest @@ -14,20 +14,16 @@ - - - - - - + + + + + + - - - - diff --git a/src/MigrationTools.Clients.FileSystem.Tests/MigrationTools.Clients.FileSystem.Tests.csproj b/src/MigrationTools.Clients.FileSystem.Tests/MigrationTools.Clients.FileSystem.Tests.csproj index 34293a13b..cb9ee4393 100644 --- a/src/MigrationTools.Clients.FileSystem.Tests/MigrationTools.Clients.FileSystem.Tests.csproj +++ b/src/MigrationTools.Clients.FileSystem.Tests/MigrationTools.Clients.FileSystem.Tests.csproj @@ -2,18 +2,16 @@ net8.0 - false - MigrationTools.Tests - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -24,7 +22,4 @@ - - - \ No newline at end of file diff --git a/src/MigrationTools.Clients.FileSystem/MigrationTools.Clients.FileSystem.csproj b/src/MigrationTools.Clients.FileSystem/MigrationTools.Clients.FileSystem.csproj index 1fb39958b..9195dbb52 100644 --- a/src/MigrationTools.Clients.FileSystem/MigrationTools.Clients.FileSystem.csproj +++ b/src/MigrationTools.Clients.FileSystem/MigrationTools.Clients.FileSystem.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;net8.0 + netstandard2.0;net8.0 MigrationTools.Sinks.FileSystem MigrationTools @@ -15,18 +15,14 @@ - - - - + + + + - - - - diff --git a/src/MigrationTools.Clients.TfsObjectModel.Tests/MigrationTools.Clients.TfsObjectModel.Tests.csproj b/src/MigrationTools.Clients.TfsObjectModel.Tests/MigrationTools.Clients.TfsObjectModel.Tests.csproj index 3a45a191c..5c980982c 100644 --- a/src/MigrationTools.Clients.TfsObjectModel.Tests/MigrationTools.Clients.TfsObjectModel.Tests.csproj +++ b/src/MigrationTools.Clients.TfsObjectModel.Tests/MigrationTools.Clients.TfsObjectModel.Tests.csproj @@ -2,26 +2,24 @@ net472 - false - MigrationTools.Tests - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + @@ -30,7 +28,4 @@ - - - \ No newline at end of file diff --git a/src/MigrationTools.Clients.TfsObjectModel/MigrationTools.Clients.TfsObjectModel.csproj b/src/MigrationTools.Clients.TfsObjectModel/MigrationTools.Clients.TfsObjectModel.csproj index e6c215916..de3a56f27 100644 --- a/src/MigrationTools.Clients.TfsObjectModel/MigrationTools.Clients.TfsObjectModel.csproj +++ b/src/MigrationTools.Clients.TfsObjectModel/MigrationTools.Clients.TfsObjectModel.csproj @@ -30,17 +30,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -48,14 +48,10 @@ - + + - - - - - diff --git a/src/MigrationTools.ConsoleCore/MigrationTools.ConsoleCore.csproj b/src/MigrationTools.ConsoleCore/MigrationTools.ConsoleCore.csproj index f47d1221d..d03a7e18e 100644 --- a/src/MigrationTools.ConsoleCore/MigrationTools.ConsoleCore.csproj +++ b/src/MigrationTools.ConsoleCore/MigrationTools.ConsoleCore.csproj @@ -14,10 +14,10 @@ - - - - + + + + @@ -25,8 +25,4 @@ - - - - diff --git a/src/MigrationTools.ConsoleDataGenerator/ClassDataLoader.cs b/src/MigrationTools.ConsoleDataGenerator/ClassDataLoader.cs index d1747a61f..09d5ebcec 100644 --- a/src/MigrationTools.ConsoleDataGenerator/ClassDataLoader.cs +++ b/src/MigrationTools.ConsoleDataGenerator/ClassDataLoader.cs @@ -165,7 +165,7 @@ static string ConvertSectionWithPathToJson(IConfiguration configuration, IConfig for (int i = 0; i < pathSegments.Length; i++) { string key = pathSegments[i]; - IConfigurationSection currentSection = configuration.GetSection(string.Join(':', pathSegments, 0, i + 1)); + IConfigurationSection currentSection = configuration.GetSection(string.Join(":", pathSegments, 0, i + 1)); if (i < pathSegments.Length - 1) { diff --git a/src/MigrationTools.ConsoleDataGenerator/MigrationTools.ConsoleDataGenerator.csproj b/src/MigrationTools.ConsoleDataGenerator/MigrationTools.ConsoleDataGenerator.csproj index a34acf7f2..31e05ba67 100644 --- a/src/MigrationTools.ConsoleDataGenerator/MigrationTools.ConsoleDataGenerator.csproj +++ b/src/MigrationTools.ConsoleDataGenerator/MigrationTools.ConsoleDataGenerator.csproj @@ -1,4 +1,4 @@ - + Exe @@ -26,8 +26,8 @@ - - + + @@ -37,8 +37,4 @@ - - - - diff --git a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj index cde1a54b2..296f828b0 100644 --- a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj +++ b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj @@ -6,13 +6,13 @@ Azure DevOps Migration Tools [Object Model] devopsmigration AnyCPU - 0.0.0.0 - 0.0.0.0 - 0.0.0-local - README.md - https://github.com/nkdAgility/azure-devops-migration-tools - https://github.com/nkdAgility/azure-devops-migration-tools - LICENSE + 0.0.0.0 + 0.0.0.0 + 0.0.0-local + README.md + https://github.com/nkdAgility/azure-devops-migration-tools + https://github.com/nkdAgility/azure-devops-migration-tools + LICENSE @@ -48,11 +48,11 @@ - - - - - + + + + + @@ -62,9 +62,4 @@ - - - - - \ No newline at end of file diff --git a/src/MigrationTools.Host.Tests/MigrationTools.Host.Tests.csproj b/src/MigrationTools.Host.Tests/MigrationTools.Host.Tests.csproj index 68e2a34b4..de59101b0 100644 --- a/src/MigrationTools.Host.Tests/MigrationTools.Host.Tests.csproj +++ b/src/MigrationTools.Host.Tests/MigrationTools.Host.Tests.csproj @@ -2,7 +2,6 @@ net8.0 - false @@ -13,10 +12,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -27,8 +26,4 @@ - - - - diff --git a/src/MigrationTools.Host/MigrationTools.Host.csproj b/src/MigrationTools.Host/MigrationTools.Host.csproj index 67d428018..d9a8bee32 100644 --- a/src/MigrationTools.Host/MigrationTools.Host.csproj +++ b/src/MigrationTools.Host/MigrationTools.Host.csproj @@ -1,53 +1,49 @@ - + - netstandard2.0;net8.0 + netstandard2.0;net8.0 ..\..\docs\Reference\Generated\MigrationTools.Host.xml - - false - + + false + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/src/MigrationTools.Shadows/MigrationTools.Shadows.csproj b/src/MigrationTools.Shadows/MigrationTools.Shadows.csproj index 8f2175617..680cf579e 100644 --- a/src/MigrationTools.Shadows/MigrationTools.Shadows.csproj +++ b/src/MigrationTools.Shadows/MigrationTools.Shadows.csproj @@ -1,17 +1,17 @@  - net472;net8.0 + net472;net8.0 enable enable - - - - - + + + + + @@ -19,8 +19,4 @@ - - - - diff --git a/src/MigrationTools.Telemetery/MigrationTools.Telemetery.csproj b/src/MigrationTools.Telemetery/MigrationTools.Telemetery.csproj index 471405fa6..57f6274fa 100644 --- a/src/MigrationTools.Telemetery/MigrationTools.Telemetery.csproj +++ b/src/MigrationTools.Telemetery/MigrationTools.Telemetery.csproj @@ -6,18 +6,20 @@ enable enable + - - - - - - - - - + + + + + + + + + + PreserveNewest @@ -30,7 +32,4 @@ - - - \ No newline at end of file diff --git a/src/MigrationTools.Tests/MigrationTools.Tests.csproj b/src/MigrationTools.Tests/MigrationTools.Tests.csproj index f436cded8..418c2f54e 100644 --- a/src/MigrationTools.Tests/MigrationTools.Tests.csproj +++ b/src/MigrationTools.Tests/MigrationTools.Tests.csproj @@ -2,17 +2,16 @@ net8.0 - false - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -24,10 +23,6 @@ - - - - diff --git a/src/MigrationTools/MigrationTools.csproj b/src/MigrationTools/MigrationTools.csproj index 944a61c11..677eb014e 100644 --- a/src/MigrationTools/MigrationTools.csproj +++ b/src/MigrationTools/MigrationTools.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net8.0 + netstandard2.0;net8.0 Azure DevOps Migration Tools API true Reference API for creating plugins for the Azure DevOps Migration Tools @@ -15,13 +15,13 @@ true - - - + + + - - false - + + false + ..\..\docs\Reference\Generated\MigrationTools.xml @@ -38,28 +38,28 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -69,10 +69,6 @@ - - - -