summaryrefslogtreecommitdiff
path: root/src/StardewModdingAPI.Web
diff options
context:
space:
mode:
Diffstat (limited to 'src/StardewModdingAPI.Web')
-rw-r--r--src/StardewModdingAPI.Web/Controllers/ModsController.cs2
-rw-r--r--src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs2
-rw-r--r--src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs2
-rw-r--r--src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs2
-rw-r--r--src/StardewModdingAPI.Web/Models/ModInfoModel.cs48
-rw-r--r--src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj1
6 files changed, 5 insertions, 52 deletions
diff --git a/src/StardewModdingAPI.Web/Controllers/ModsController.cs b/src/StardewModdingAPI.Web/Controllers/ModsController.cs
index 06a80638..8fc2cb51 100644
--- a/src/StardewModdingAPI.Web/Controllers/ModsController.cs
+++ b/src/StardewModdingAPI.Web/Controllers/ModsController.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options;
using StardewModdingAPI.Web.Framework.ConfigModels;
using StardewModdingAPI.Web.Framework.ModRepositories;
-using StardewModdingAPI.Web.Models;
+using StardewModdingAPI.Models;
namespace StardewModdingAPI.Web.Controllers
{
diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs b/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs
index 67e706ed..421220de 100644
--- a/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs
+++ b/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs
@@ -2,7 +2,7 @@ using System;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Pathoschild.Http.Client;
-using StardewModdingAPI.Web.Models;
+using StardewModdingAPI.Models;
namespace StardewModdingAPI.Web.Framework.ModRepositories
{
diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs b/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs
index 7fd735cd..98e4c957 100644
--- a/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs
+++ b/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs
@@ -1,6 +1,6 @@
using System;
using System.Threading.Tasks;
-using StardewModdingAPI.Web.Models;
+using StardewModdingAPI.Models;
namespace StardewModdingAPI.Web.Framework.ModRepositories
{
diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs b/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
index 312058ae..6cf5b04a 100644
--- a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
+++ b/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
@@ -2,7 +2,7 @@ using System;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Pathoschild.Http.Client;
-using StardewModdingAPI.Web.Models;
+using StardewModdingAPI.Models;
namespace StardewModdingAPI.Web.Framework.ModRepositories
{
diff --git a/src/StardewModdingAPI.Web/Models/ModInfoModel.cs b/src/StardewModdingAPI.Web/Models/ModInfoModel.cs
deleted file mode 100644
index 4e9762e5..00000000
--- a/src/StardewModdingAPI.Web/Models/ModInfoModel.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Newtonsoft.Json;
-
-namespace StardewModdingAPI.Web.Models
-{
- /// <summary>Generic metadata about a mod.</summary>
- internal class ModInfoModel
- {
- /*********
- ** Accessors
- *********/
- /// <summary>The mod name.</summary>
- public string Name { get; }
-
- /// <summary>The mod's semantic version number.</summary>
- public string Version { get; }
-
- /// <summary>The mod's web URL.</summary>
- public string Url { get; }
-
- /// <summary>The error message indicating why the mod is invalid (if applicable).</summary>
- public string Error { get; }
-
-
- /*********
- ** Public methods
- *********/
- /// <summary>Construct a valid instance.</summary>
- /// <param name="name">The mod name.</param>
- /// <param name="version">The mod's semantic version number.</param>
- /// <param name="url">The mod's web URL.</param>
- /// <param name="error">The error message indicating why the mod is invalid (if applicable).</param>
- [JsonConstructor]
- public ModInfoModel(string name, string version, string url, string error = null)
- {
- this.Name = name;
- this.Version = version;
- this.Url = url;
- this.Error = error; // mainly initialised here for the JSON deserialiser
- }
-
- /// <summary>Construct an valid instance.</summary>
- /// <param name="error">The error message indicating why the mod is invalid.</param>
- public ModInfoModel(string error)
- {
- this.Error = error;
- }
- }
-}
diff --git a/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj b/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj
index 2af7c3df..c30abc55 100644
--- a/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj
+++ b/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj
@@ -15,5 +15,6 @@
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
</ItemGroup>
+ <Import Project="..\StardewModdingAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" />
</Project>