From 17274837cb4fd4f38874805b6639d7c35abf7016 Mon Sep 17 00:00:00 2001 From: hhvrc Date: Thu, 6 Feb 2025 10:20:34 +0100 Subject: [PATCH 1/4] Clean up project files --- API/API.csproj | 17 ++------ Common.Tests/Common.Tests.csproj | 45 ++++++++------------ Common/Common.csproj | 15 ++----- Cron/Cron.csproj | 20 +++------ LiveControlGateway/LiveControlGateway.csproj | 23 +++------- MigrationHelper/MigrationHelper.csproj | 7 +-- Shared.props | 14 ++++++ 7 files changed, 53 insertions(+), 88 deletions(-) create mode 100644 Shared.props diff --git a/API/API.csproj b/API/API.csproj index 06c92c88..fbbeb89b 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -1,24 +1,16 @@ + - net9.0 - enable - enable - OpenShock.API - OpenShock.API - 3.10.3 true - OpenShock - API - a2109c1e-fb11-44d7-8127-346ef60cb9a5 - 1701;1702;IL2121;1591 + 1701;1702;IL2121;1591 - 1701;1702;IL2121;1591 + 1701;1702;IL2121;1591 @@ -69,11 +61,10 @@ - Always + Always Always - diff --git a/Common.Tests/Common.Tests.csproj b/Common.Tests/Common.Tests.csproj index 4fe4f6df..54897e97 100644 --- a/Common.Tests/Common.Tests.csproj +++ b/Common.Tests/Common.Tests.csproj @@ -1,32 +1,23 @@  + - - net9.0 - enable - enable - OpenShock.Common.Tests - OpenShock.Common.Tests - OpenShock - OpenShock.Common.Tests - + + + + + + - - - - - - - - - - - - - Always - - - Always - - + + + + + + Always + + + Always + + diff --git a/Common/Common.csproj b/Common/Common.csproj index 3491729e..cfb56605 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -1,23 +1,15 @@ + - net9.0 - enable - enable - OpenShock.Common - OpenShock.Common - OpenShock - OpenShock.Common - 3.1.0 - 3.1.0 Library - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -54,5 +46,4 @@ - diff --git a/Cron/Cron.csproj b/Cron/Cron.csproj index b2a2965a..70439482 100644 --- a/Cron/Cron.csproj +++ b/Cron/Cron.csproj @@ -1,15 +1,5 @@  - - - net9.0 - enable - enable - OpenShock.Cron - OpenShock.Cron - OpenShock - 3.10.3 - a2109c1e-fb11-44d7-8127-346ef60cb9a5 - + @@ -18,12 +8,12 @@ - + - - Always - + + Always + diff --git a/LiveControlGateway/LiveControlGateway.csproj b/LiveControlGateway/LiveControlGateway.csproj index 0dc18197..d3774f26 100644 --- a/LiveControlGateway/LiveControlGateway.csproj +++ b/LiveControlGateway/LiveControlGateway.csproj @@ -1,16 +1,8 @@ - + + - net9.0 - enable - enable - OpenShock.LiveControlGateway - OpenShock.LiveControlGateway - OpenShock - 3.10.3 - LiveControlGateway true - a2109c1e-fb11-44d7-8127-346ef60cb9a5 @@ -39,14 +31,13 @@ - - + + - + Always - + - - + \ No newline at end of file diff --git a/MigrationHelper/MigrationHelper.csproj b/MigrationHelper/MigrationHelper.csproj index ac44c8eb..b5f8a6fc 100644 --- a/MigrationHelper/MigrationHelper.csproj +++ b/MigrationHelper/MigrationHelper.csproj @@ -1,14 +1,11 @@  + Exe - net9.0 - enable - enable - + - diff --git a/Shared.props b/Shared.props new file mode 100644 index 00000000..a14a9a78 --- /dev/null +++ b/Shared.props @@ -0,0 +1,14 @@ + + + net9.0 + enable + enable + OpenShock + $(Company).$(MSBuildProjectName) + $(Product) + $(Product.Replace(" ", "_")) + 3.10.3 + $(AssemblyVersion) + a2109c1e-fb11-44d7-8127-346ef60cb9a5 + + \ No newline at end of file From b61208ee77b892a1f6ef07713529d8e54d1cacd0 Mon Sep 17 00:00:00 2001 From: hhvrc Date: Thu, 6 Feb 2025 10:33:55 +0100 Subject: [PATCH 2/4] Include more package specific props --- Shared.props | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Shared.props b/Shared.props index a14a9a78..c655898d 100644 --- a/Shared.props +++ b/Shared.props @@ -1,14 +1,34 @@ + + OpenShock + $(Company).$(MSBuildProjectName) + 3.10.3 + + https://github.com/openshock/api + README.md + LICENSE + True + + + + + True + \ + + + True + \ + + + net9.0 enable enable - OpenShock - $(Company).$(MSBuildProjectName) $(Product) $(Product.Replace(" ", "_")) - 3.10.3 - $(AssemblyVersion) + $(Version) + $(Version) a2109c1e-fb11-44d7-8127-346ef60cb9a5 \ No newline at end of file From d19ae3418f87c596270fbe596411dff6644b7947 Mon Sep 17 00:00:00 2001 From: hhvrc Date: Thu, 6 Feb 2025 10:39:10 +0100 Subject: [PATCH 3/4] Minor fixup --- Shared.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shared.props b/Shared.props index c655898d..846aa1cb 100644 --- a/Shared.props +++ b/Shared.props @@ -4,18 +4,18 @@ $(Company).$(MSBuildProjectName) 3.10.3 - https://github.com/openshock/api + https://github.com/OpenShock/API README.md LICENSE True - + True \ - + True \ From 02c27f0525c3b2ba598c0a1235a337777f2d997b Mon Sep 17 00:00:00 2001 From: hhvrc Date: Thu, 6 Feb 2025 10:55:22 +0100 Subject: [PATCH 4/4] Add Package License URL --- Shared.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Shared.props b/Shared.props index 846aa1cb..384bee9e 100644 --- a/Shared.props +++ b/Shared.props @@ -7,6 +7,7 @@ https://github.com/OpenShock/API README.md LICENSE + $(RepositoryUrl)/LICENSE True