diff --git a/BrixelAPI.SpaceAPI/BrixelAPI.SpaceState.csproj b/BrixelAPI.SpaceAPI/BrixelAPI.SpaceState.csproj
index b291140..1c9bc44 100644
--- a/BrixelAPI.SpaceAPI/BrixelAPI.SpaceState.csproj
+++ b/BrixelAPI.SpaceAPI/BrixelAPI.SpaceState.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net8.0
@@ -13,12 +13,12 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/SpaceAPI.Data/Contexts/LogContext.cs b/SpaceAPI.Data/Contexts/LogContext.cs
deleted file mode 100644
index 505e6d4..0000000
--- a/SpaceAPI.Data/Contexts/LogContext.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore;
-using SpaceAPI.Data.Interfaces;
-using SpaceAPI.Data.Models;
-
-namespace SpaceAPI.Data.Contexts
-{
-
- public interface ILogContext
- {
- int SaveChanges();
- DbSet StateLogs { get; set; }
-
- }
-
- public class LogContext : DbContext
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
-
- public LogContext(IHttpContextAccessor httpContextAccessor, DbContextOptions options)
- : base(options)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- public override int SaveChanges(string currentUser = "anonymouse")
- {
- foreach (var auditableEntity in ChangeTracker.Entries())
- {
- if (auditableEntity.State == EntityState.Added ||
- auditableEntity.State == EntityState.Modified)
- {
- // implementation may change based on the useage scenario, this
- // sample is for forma authentication.
-
-
- // modify updated date and updated by column for
- // adds of updates.
- auditableEntity.Entity.UpdatedDate = DateTime.Now;
- auditableEntity.Entity.UpdatedBy = currentUser;
-
- // pupulate created date and created by columns for
- // newly added record.
- if (auditableEntity.State == EntityState.Added)
- {
- auditableEntity.Entity.CreatedDate = DateTime.Now;
- auditableEntity.Entity.CreatedBy = currentUser;
- }
- else
- {
- // we also want to make sure that code is not inadvertly
- // modifying created date and created by columns
- auditableEntity.Property(p => p.CreatedDate).IsModified = false;
- auditableEntity.Property(p => p.CreatedBy).IsModified = false;
- }
- }
- }
- return base.SaveChanges();
- }
-
- public DbSet StateLogs { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Interfaces/AuditableEntity.cs b/SpaceAPI.Data/Interfaces/AuditableEntity.cs
deleted file mode 100644
index 551c978..0000000
--- a/SpaceAPI.Data/Interfaces/AuditableEntity.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace SpaceAPI.Data.Interfaces
-{
- public abstract class AuditableEntity : IAuditableEntity
- {
- public DateTime CreatedDate { get; set; }
- public String CreatedBy { get; set; }
- public DateTime UpdatedDate { get; set; }
- public String UpdatedBy { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Interfaces/IAuditableEntity.cs b/SpaceAPI.Data/Interfaces/IAuditableEntity.cs
deleted file mode 100644
index 5099e45..0000000
--- a/SpaceAPI.Data/Interfaces/IAuditableEntity.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace SpaceAPI.Data.Interfaces
-{
- public interface IAuditableEntity
- {
- DateTime CreatedDate { get; set; }
- String CreatedBy { get; set; }
- DateTime UpdatedDate { get; set; }
- String UpdatedBy { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.Designer.cs b/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.Designer.cs
deleted file mode 100644
index 8fff760..0000000
--- a/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SpaceAPI.Data.Contexts;
-
-namespace SpaceAPI.Model.Migrations
-{
- [DbContext(typeof(LogContext))]
- [Migration("20200128215938_InitialCreate")]
- partial class InitialCreate
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("SpaceAPI.Data.Models.StateLog", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("CreatedBy")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreatedDate")
- .HasColumnType("datetime2");
-
- b.Property("Open")
- .HasColumnType("bit");
-
- b.Property("UpdatedBy")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UpdatedDate")
- .HasColumnType("datetime2");
-
- b.HasKey("Id");
-
- b.ToTable("StateLogs");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.cs b/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.cs
deleted file mode 100644
index eb5112d..0000000
--- a/SpaceAPI.Data/Migrations/20200128215938_InitialCreate.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace SpaceAPI.Model.Migrations
-{
- public partial class InitialCreate : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "StateLogs",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- CreatedDate = table.Column(nullable: false),
- CreatedBy = table.Column(nullable: true),
- UpdatedDate = table.Column(nullable: false),
- UpdatedBy = table.Column(nullable: true),
- Open = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_StateLogs", x => x.Id);
- });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "StateLogs");
- }
- }
-}
diff --git a/SpaceAPI.Data/Migrations/LogContextModelSnapshot.cs b/SpaceAPI.Data/Migrations/LogContextModelSnapshot.cs
deleted file mode 100644
index 981da1c..0000000
--- a/SpaceAPI.Data/Migrations/LogContextModelSnapshot.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SpaceAPI.Data.Contexts;
-
-namespace SpaceAPI.Model.Migrations
-{
- [DbContext(typeof(LogContext))]
- partial class LogContextModelSnapshot : ModelSnapshot
- {
- protected override void BuildModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("SpaceAPI.Data.Models.StateLog", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("CreatedBy")
- .HasColumnType("nvarchar(max)");
-
- b.Property("CreatedDate")
- .HasColumnType("datetime2");
-
- b.Property("Open")
- .HasColumnType("bit");
-
- b.Property("UpdatedBy")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UpdatedDate")
- .HasColumnType("datetime2");
-
- b.HasKey("Id");
-
- b.ToTable("StateLogs");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/SpaceAPI.Data/Models/API/Cache.cs b/SpaceAPI.Data/Models/API/Cache.cs
deleted file mode 100644
index 22ebb16..0000000
--- a/SpaceAPI.Data/Models/API/Cache.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SpaceAPI.Models.API
-{
- public class Cache
- {
- public string Schedule { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/Contact.cs b/SpaceAPI.Data/Models/API/Contact.cs
deleted file mode 100644
index 9368827..0000000
--- a/SpaceAPI.Data/Models/API/Contact.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace SpaceAPI.Models.API
-{
- public class Contact
- {
- public string Twitter { get; set; }
- public string Email { get; set; }
- public string Irc { get; set; }
- public string Ml { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/EntityBase.cs b/SpaceAPI.Data/Models/API/EntityBase.cs
deleted file mode 100644
index 32f6bd2..0000000
--- a/SpaceAPI.Data/Models/API/EntityBase.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region
-
-using System;
-using System.Runtime.Serialization;
-using SpaceAPI.Data.Interfaces;
-
-#endregion
-
-namespace SpaceAPI.Data.Models.API
-{
- public interface IEntityBase
- {
- int Id { get; set; }
- }
-
- [DataContract]
- public class EntityBase : IAuditableEntity, IEntityBase
- {
- #region IAuditableEntity Members
-
- [DataMember]
- public DateTime CreatedDate { get; set; }
-
- [DataMember]
- public string CreatedBy { get; set; }
-
- [DataMember]
- public DateTime UpdatedDate { get; set; }
-
- [DataMember]
- public string UpdatedBy { get; set; }
-
- #endregion
-
- #region IEntityBase Members
-
- [DataMember]
- public int Id { get; set; }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/Location.cs b/SpaceAPI.Data/Models/API/Location.cs
deleted file mode 100644
index 262988e..0000000
--- a/SpaceAPI.Data/Models/API/Location.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace SpaceAPI.Data.Models.API
-{
- public class Location
- {
- public string Address { get; set; }
- public float Lon { get; set; }
- public float Lat { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/Root.cs b/SpaceAPI.Data/Models/API/Root.cs
deleted file mode 100644
index bf1feac..0000000
--- a/SpaceAPI.Data/Models/API/Root.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using SpaceAPI.Data.Models.API;
-
-namespace SpaceAPI.Models.API
-{
- public class Root
- {
- public Root()
- {
-
- }
- public string Api { get; set; }
- public string Space { get; set; }
- public string Logo { get; set; }
- public string Url { get; set; }
- public Location Location { get; set; }
- public Spacefed Spacefed { get; set; }
- public Contact Contact { get; set; }
- public string[] Issue_Report_Channels { get; set; }
- public State State { get; set; }
- public string[] Projects { get; set; }
- public Cache Cache { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/Spacefed.cs b/SpaceAPI.Data/Models/API/Spacefed.cs
deleted file mode 100644
index b500452..0000000
--- a/SpaceAPI.Data/Models/API/Spacefed.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace SpaceAPI.Models.API
-{
- public class Spacefed
- {
- public bool Spacenet { get; set; }
- public bool Spacesaml { get; set; }
- public bool Spacephone { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/API/State.cs b/SpaceAPI.Data/Models/API/State.cs
deleted file mode 100644
index 59c4306..0000000
--- a/SpaceAPI.Data/Models/API/State.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SpaceAPI.Models.API
-{
- public class State
- {
- public bool Open { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/Response.cs b/SpaceAPI.Data/Models/Response.cs
deleted file mode 100644
index 8fa91c8..0000000
--- a/SpaceAPI.Data/Models/Response.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace SpaceAPI.Data.Models
-{
- public class Response
- {
- public enum StatusType
- {
- Open,
- Closed,
- Unknown
- };
- public StatusType Status { get; set; }
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/Models/StateLog.cs b/SpaceAPI.Data/Models/StateLog.cs
deleted file mode 100644
index d43d8bb..0000000
--- a/SpaceAPI.Data/Models/StateLog.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Runtime.Serialization;
-using SpaceAPI.Data.Models.API;
-
-namespace SpaceAPI.Data.Models
-{
- [DataContract]
- public class StateLog : EntityBase
- {
-
- public StateLog()
- {
-
-
- }
-
-
- [DataMember]
- public bool Open { get; set; }
-
-
- }
-}
\ No newline at end of file
diff --git a/SpaceAPI.Data/SpaceAPI.Data.csproj b/SpaceAPI.Data/SpaceAPI.Data.csproj
deleted file mode 100644
index 001603b..0000000
--- a/SpaceAPI.Data/SpaceAPI.Data.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- net6.0
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
diff --git a/SpaceAPI.Host/Dockerfile b/SpaceAPI.Host/Dockerfile
index d798084..cebfa54 100644
--- a/SpaceAPI.Host/Dockerfile
+++ b/SpaceAPI.Host/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["SpaceAPI.API/SpaceAPI.API.csproj", "SpaceAPI.API/"]
RUN dotnet restore "SpaceAPI.API/SpaceAPI.API.csproj"
diff --git a/SpaceAPI.Host/SpaceAPI.Host.csproj b/SpaceAPI.Host/SpaceAPI.Host.csproj
index a9d41ca..460549f 100644
--- a/SpaceAPI.Host/SpaceAPI.Host.csproj
+++ b/SpaceAPI.Host/SpaceAPI.Host.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net8.0
1904837a-a08b-4fe9-b373-30abf35fe76c
Linux
0.1.0+beta
@@ -10,13 +10,13 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/SpaceAPI.Test/SpaceAPI.Test.csproj b/SpaceAPI.Test/SpaceAPI.Test.csproj
index e5952fa..93a9739 100644
--- a/SpaceAPI.Test/SpaceAPI.Test.csproj
+++ b/SpaceAPI.Test/SpaceAPI.Test.csproj
@@ -1,14 +1,14 @@
- net6.0
+ net8.0
false
-
+
diff --git a/SpaceAPI.sln b/SpaceAPI.sln
index f46fd76..ff80d86 100644
--- a/SpaceAPI.sln
+++ b/SpaceAPI.sln
@@ -9,6 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpaceAPI.Test", "SpaceAPI.T
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrixelAPI.SpaceState", "BrixelAPI.SpaceAPI\BrixelAPI.SpaceState.csproj", "{CE83D549-7301-4289-9450-0F945F9BC21D}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+ ProjectSection(SolutionItems) = preProject
+ docker-compose.yml = docker-compose.yml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU