Updating

2026-04-13 16:52:52 +00:00
parent c535080e37
commit 26d007182d
11 changed files with 52 additions and 19 deletions
@@ -89,6 +89,7 @@
    </httpModules>
  </system.web>
  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
    <handlers>
      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
      <remove name="OPTIONSVerbHandler" />
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29905.134
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotApi", "LCU.API.Internal.MaidBotApi\LCU.Api.Internal.MaidBotApi.csproj", "{1C92A326-91A3-4904-B3EF-B766E10E7191}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotApi", "LCU.Api.Internal.MaidBotApi\LCU.Api.Internal.MaidBotApi.csproj", "{1C92A326-91A3-4904-B3EF-B766E10E7191}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotTests", "LCU.Api.Internal.MaidBotTests\LCU.Api.Internal.MaidBotTests.csproj", "{98503299-44F3-410A-B61F-36BC1706F132}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LCU.Api.Internal.MaidBotLib
 EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "LCU.Api.Internal.MaidBotSql", "LCU.Api.Internal.MaidBotSql\LCU.Api.Internal.MaidBotSql.sqlproj", "{ECCE6677-A2F2-4694-964F-F91EBE7AAC00}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LCU.Library.Internal.MaidBotModels", "LCU.Library.Internal.MaidBotModels\LCU.Library.Internal.MaidBotModels.csproj", "{819AD89D-FF34-479C-A894-1C0F9704410A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,6 +46,10 @@ Global
 		{ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECCE6677-A2F2-4694-964F-F91EBE7AAC00}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{819AD89D-FF34-479C-A894-1C0F9704410A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{819AD89D-FF34-479C-A894-1C0F9704410A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{819AD89D-FF34-479C-A894-1C0F9704410A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{819AD89D-FF34-479C-A894-1C0F9704410A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Version>1.0.2</Version>
 		<Description>
@@ -17,9 +17,13 @@
 	</PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\LCU.Library.Internal.MaidBotModels\LCU.Library.Internal.MaidBotModels.csproj" />
+  </ItemGroup>
+
 </Project>
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>1.0.0</Version>
+    <Description>LCU Internal MaidBot model definitions.</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+  </ItemGroup>
+
+</Project>
@@ -1,4 +1,4 @@
-namespace LCU.Api.Internal.MaidBotLib.Models
+namespace LCU.Api.Internal.MaidBotLib.Models
 {
    public class DebugEventLog
    {
@@ -6,7 +6,6 @@

        public DebugEventLog()
        {
-
        }

        public DebugEventLog(EventLog eventLog)
@@ -15,6 +14,7 @@
        }

        public int DebugEventLogId { get; set; }
+
        public string RawLog { get; set; }
    }
-}
+}
@@ -1,16 +1,23 @@
-using System;
+using System;

 namespace LCU.Api.Internal.MaidBotLib.Models
 {
    public class EventLog
    {
        public int EventLogId { get; set; }
+
        public string Application { get; set; }
-        public string Level { get; set; }  
+
+        public string Level { get; set; }
+
        public string Group { get; set; }
+
        public DateTime LogTimeStamp { get; set; }
+
        public string Message { get; set; }
+
        public string Environment { get; set; }
+
        public string DebugData { get; set; }
    }
-}
+}
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace LCU.Api.Internal.MaidBotLib.Models
 {
    public enum GroupEnum
@@ -1,18 +1,23 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;

 namespace LCU.Api.Internal.MaidBotLib.Models
 {
    public class LoggingMatrix
    {
        public int LoggingMatrixId { get; set; }
+
        [StringLength(200, MinimumLength = 1, ErrorMessage = "Application field must have a length between 1 and 200 characters")]
        public string Application { get; set; }
+
        [StringLength(50, MinimumLength = 1, ErrorMessage = "Level field must have a length between 1 and 50 characters")]
        public string Level { get; set; }
+
        [StringLength(100, MinimumLength = 1, ErrorMessage = "Groups field must have a length between 1 and 100 characters")]
        public string Group { get; set; }
+
        [StringLength(100, MinimumLength = 1, ErrorMessage = "Emails field must have a length between 1 and 100 characters")]
        public string Email { get; set; }
+
        public bool Disabled { get; set; }
    }
-}
+}
@@ -1,4 +1,4 @@
-namespace LCU.Api.Internal.MaidBotLib.Models
+namespace LCU.Api.Internal.MaidBotLib.Models
 {
    public enum PropertyEnum
    {
@@ -5,6 +5,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS aspnetcore-build
 COPY LCU.API.Internal.MemberPreferencesApi/LCU.API.Internal.MemberPreferencesApi.csproj ./source/LCU.API.Internal.MemberPreferencesApi/
 COPY LCU.API.Internal.MemberPreferencesApiLib/LCU.API.Internal.MemberPreferencesApiLib.csproj ./source/LCU.API.Internal.MemberPreferencesApiLib/
 COPY LCU.Library.Internal.MemberPreferencesApiModels/LCU.Library.Internal.MemberPreferencesApiModels.csproj ./source/LCU.Library.Internal.MemberPreferencesApiModels/
+COPY LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/

 # Install Credential Provider and set env variables to enable Nuget restore with auth
 ARG PAT=bh2lq3jibktw67b2wdbqyfln7cd3je6lk52kijntpj43v6kimpgq
@@ -19,8 +20,7 @@ RUN dotnet restore -s "https://landmarkcu.pkgs.visualstudio.com/_packaging/LCU-I
 COPY . ./source/

 LABEL test=true
-COPY LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/
-RUN dotnet restore ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj
+RUN dotnet restore -s "https://landmarkcu.pkgs.visualstudio.com/_packaging/LCU-Internal/nuget/v3/index.json" -s "https://api.nuget.org/v3/index.json" ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj
 RUN dotnet test -c Release --results-directory /testresults --logger "trx;LogFileName=test_results.trx"  ./source/LCU.API.Internal.MemberPreferencesApi.UnitTests/LCU.API.Internal.MemberPreferencesApi.UnitTests.csproj

 # .NET Core Publish