Fix Version

muhmuhhum · Oct 2, 2021 · 4bf4ee6 · 4bf4ee6
1 parent cdb6c76
commit 4bf4ee6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/EinsamerWanderer.API/EinsamerWanderer.API.csproj b/EinsamerWanderer.API/EinsamerWanderer.API.csproj
@@ -1,25 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="AutoMapper" Version="10.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.1.21452.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-rc.1.21452.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
-    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.1-dev-00229" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.1-dev-00787" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.5.0-alpha0003" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EinsamerWanderer.API/Model/Character.cs b/EinsamerWanderer.API/Model/Character.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace EinsamerWanderer.API.Model
 {
@@ -7,5 +8,6 @@ public class Character
         public Guid Id { get; set; }
         public string Name { get; set; }
         public long Experience { get; set; }
+        public List<Item> Items { get; set; }
     }
 }
diff --git a/EinsamerWanderer.API/Model/Enums/Rarity.cs b/EinsamerWanderer.API/Model/Enums/Rarity.cs
@@ -0,0 +1,10 @@
+namespace EinsamerWanderer.API.Model.Enums
+{
+    public enum Rarity
+    {
+        Common,
+        Rare,
+        Exotic,
+        Legendary
+    }
+}
diff --git a/EinsamerWanderer.API/Model/Item.cs b/EinsamerWanderer.API/Model/Item.cs
@@ -1,4 +1,5 @@
 using System;
+using EinsamerWanderer.API.Model.Enums;
 
 namespace EinsamerWanderer.API.Model
 {
@@ -7,5 +8,7 @@ public class Item
         public Guid Id { get; set; }
         public string Name { get; set; }
         public double Value { get; set; }
+
+        public Rarity Rarity { get; set; }
     }
 }
diff --git a/EinsamerWanderer.API/Program.cs b/EinsamerWanderer.API/Program.cs
@@ -52,7 +52,6 @@ private static void ConfigureLogging()
             Log.Logger = new LoggerConfiguration()
                 .Enrich.FromLogContext()
                 .Enrich.WithMachineName()
-                .WriteTo.Debug()
                 .WriteTo.Console()
                 .WriteTo.Elasticsearch(ConfigureElasticSink(configuration, environment))
                 .Enrich.WithProperty("Environment", environment)

diff --git a/EinsamerWanderer.API/appsettings.Development.json b/EinsamerWanderer.API/appsettings.Development.json
@@ -9,7 +9,7 @@
     }
   },
   "ElasticConfiguration": {
-    "Uri": "http://host.docker.internal:9200/"
+    "Uri": "http://localhost:9200/"
   },
   "ConnectionStrings": {
     "DefaultConnection": "User ID=admin;Password=StrongPwd123;Host=host.docker.internal;Port=5432;Database=EinsamerWanderer;"

diff --git a/EinsamerWanderer.Web/EinsamerWanderer.Web.csproj b/EinsamerWanderer.Web/EinsamerWanderer.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 

diff --git a/EinsamerWanderer.sln b/EinsamerWanderer.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EinsamerWanderer.API", "Ein
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EinsamerWanderer.Shared", "EinsamerWanderer.Shared\EinsamerWanderer.Shared.csproj", "{7CCB2ADF-7B60-4AFB-9E71-ABE0E49080A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EinsamerWanderer.Web", "EinsamerWanderer.Web\EinsamerWanderer.Web.csproj", "{BF30B7C6-93C4-4F34-80A0-C20E005774DF}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{7CCB2ADF-7B60-4AFB-9E71-ABE0E49080A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CCB2ADF-7B60-4AFB-9E71-ABE0E49080A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CCB2ADF-7B60-4AFB-9E71-ABE0E49080A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF30B7C6-93C4-4F34-80A0-C20E005774DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF30B7C6-93C4-4F34-80A0-C20E005774DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF30B7C6-93C4-4F34-80A0-C20E005774DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF30B7C6-93C4-4F34-80A0-C20E005774DF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE