Merge branch 'main' into 'dev'

Merge hotfix

See merge request leon.hoppe/hopframe!8

.gitlab-ci.yml

@@ -17,18 +17,25 @@ build:
   artifacts:
     paths:
       - "**/bin/Release"
+    expire_in: 10 minutes
 
 test:
   stage: test
   script:
     - dotnet test --verbosity normal
+  dependencies:
+    - build
 
 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
+    - tags
-  variables: 
+  dependencies:
+    - build
+    - test
+  variables:
     NUGET_API_KEY: $NUGET_API_KEY

HopFrame.sln.DotSettings.user

@@ -79,6 +79,7 @@
 	
 	
 	
+	
 	
 	
 	</wpf:ResourceDictionary>

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>

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>

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>

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>

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>

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>

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>