From 1ede337565830b42cd206d70ee9aafdf3f01b9a7 Mon Sep 17 00:00:00 2001
From: Leon Hoppe <leon@ladenbau-hoppe.de>
Date: Sun, 22 Dec 2024 19:23:22 +0100
Subject: [PATCH 1/2] Updated ci pipeline

---
 .gitlab-ci.yml                | 7 ++++---
 HopFrame.sln.DotSettings.user | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8ae244..47ff617 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,9 +26,10 @@ test:
 publish:
   stage: publish
   script:
-    - dotnet pack -c Release -o .
+    - export VERSION=$(echo $CI_COMMIT_TAG | sed 's/^v//')
+    - dotnet pack -c Release -o . /p:Version=$VERSION
     - for nupkg in *.nupkg; do dotnet nuget push $nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json; done
   only:
-    - main
-  variables: 
+    - tags
+  variables:
     NUGET_API_KEY: $NUGET_API_KEY
diff --git a/HopFrame.sln.DotSettings.user b/HopFrame.sln.DotSettings.user
index 12afe51..ae702c9 100644
--- a/HopFrame.sln.DotSettings.user
+++ b/HopFrame.sln.DotSettings.user
@@ -79,6 +79,7 @@
 	
 	
 	
+	
 	
 	
 	</wpf:ResourceDictionary>
\ No newline at end of file

From 1bc48b0ba249536d03002208d4e56e6faeaef53f Mon Sep 17 00:00:00 2001
From: Leon Hoppe <leon@ladenbau-hoppe.de>
Date: Sun, 22 Dec 2024 19:38:16 +0100
Subject: [PATCH 2/2] Removed unnecessary versions + fixed ci artifacts

---
 .gitlab-ci.yml                                           | 6 ++++++
 src/HopFrame.Api/HopFrame.Api.csproj                     | 1 -
 src/HopFrame.Database/HopFrame.Database.csproj           | 1 -
 src/HopFrame.Security/HopFrame.Security.csproj           | 1 -
 src/HopFrame.Web.Admin/HopFrame.Web.Admin.csproj         | 1 -
 src/HopFrame.Web/HopFrame.Web.csproj                     | 1 -
 testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj | 1 +
 testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj | 1 +
 8 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47ff617..00dccf3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,14 @@ build:
   artifacts:
     paths:
       - "**/bin/Release"
+    expire_in: 10 minutes
 
 test:
   stage: test
   script:
     - dotnet test --verbosity normal
+  dependencies:
+    - build
 
 publish:
   stage: publish
@@ -31,5 +34,8 @@ publish:
     - for nupkg in *.nupkg; do dotnet nuget push $nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json; done
   only:
     - tags
+  dependencies:
+    - build
+    - test
   variables:
     NUGET_API_KEY: $NUGET_API_KEY
diff --git a/src/HopFrame.Api/HopFrame.Api.csproj b/src/HopFrame.Api/HopFrame.Api.csproj
index 091e5a1..eec3157 100644
--- a/src/HopFrame.Api/HopFrame.Api.csproj
+++ b/src/HopFrame.Api/HopFrame.Api.csproj
@@ -7,7 +7,6 @@
         <Nullable>disable</Nullable>
         
         <PackageId>HopFrame.Api</PackageId>
-        <Version>2.0.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <IsPackable>true</IsPackable>
diff --git a/src/HopFrame.Database/HopFrame.Database.csproj b/src/HopFrame.Database/HopFrame.Database.csproj
index cd670af..b5a9c94 100644
--- a/src/HopFrame.Database/HopFrame.Database.csproj
+++ b/src/HopFrame.Database/HopFrame.Database.csproj
@@ -7,7 +7,6 @@
         <Nullable>disable</Nullable>
 
         <PackageId>HopFrame.Database</PackageId>
-        <Version>2.0.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <IsPackable>true</IsPackable>
diff --git a/src/HopFrame.Security/HopFrame.Security.csproj b/src/HopFrame.Security/HopFrame.Security.csproj
index 74c1d50..9c6002d 100644
--- a/src/HopFrame.Security/HopFrame.Security.csproj
+++ b/src/HopFrame.Security/HopFrame.Security.csproj
@@ -8,7 +8,6 @@
         <RootNamespace>HopFrame.Security</RootNamespace>
 
         <PackageId>HopFrame.Security</PackageId>
-        <Version>2.0.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <IsPackable>true</IsPackable>
diff --git a/src/HopFrame.Web.Admin/HopFrame.Web.Admin.csproj b/src/HopFrame.Web.Admin/HopFrame.Web.Admin.csproj
index e1a0004..5894bc8 100644
--- a/src/HopFrame.Web.Admin/HopFrame.Web.Admin.csproj
+++ b/src/HopFrame.Web.Admin/HopFrame.Web.Admin.csproj
@@ -6,7 +6,6 @@
         <Nullable>disable</Nullable>
 
         <PackageId>HopFrame.Web.Admin</PackageId>
-        <Version>2.0.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <IsPackable>true</IsPackable>
diff --git a/src/HopFrame.Web/HopFrame.Web.csproj b/src/HopFrame.Web/HopFrame.Web.csproj
index 1eb0490..bc4e871 100644
--- a/src/HopFrame.Web/HopFrame.Web.csproj
+++ b/src/HopFrame.Web/HopFrame.Web.csproj
@@ -7,7 +7,6 @@
         <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 
         <PackageId>HopFrame.Web</PackageId>
-        <Version>2.0.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <IsPackable>true</IsPackable>
diff --git a/testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj b/testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj
index 5c6c301..59ff610 100644
--- a/testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj
+++ b/testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>disable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj b/testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj
index e043848..1a414ba 100644
--- a/testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj
+++ b/testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>disable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>