Skip to content
This repository was archived by the owner on Oct 23, 2019. It is now read-only.

Commit 3655b92

Browse files
committed
Ported over to new plugin structure
1 parent f4a90dc commit 3655b92

23 files changed

Lines changed: 222 additions & 74 deletions

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
.vs/
2-
bin/
1+
/.vs/
2+
/packages/
3+
/plugins/
4+
/Overlays/
5+
/*.dll
36
obj/
4-
packages/
57
*.user
6-
*.dll

NFive.SessionManager.sln

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
43
VisualStudioVersion = 15.0.27703.2042
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{26E59BC9-9A7E-4ABB-8CE0-48FB857F38C0}") = "NFive.SessionManager", "NFive.SessionManager.csproj", "{3DFD2771-F0CF-4001-9B93-46FDC0A95C8C}"
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{644CE3E2-EC42-40B6-BD8C-2339D1E24984}"
6+
ProjectSection(SolutionItems) = preProject
7+
nfive.yml = nfive.yml
8+
EndProjectSection
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionManager.Server", "SessionManager.Server\SessionManager.Server.csproj", "{AA855773-7A61-4190-91B9-20B608AD2DA4}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionManager.Shared", "SessionManager.Shared\SessionManager.Shared.csproj", "{4A9818BF-B338-4EBA-9257-DADF300CD740}"
713
EndProject
814
Global
915
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1016
Debug|Any CPU = Debug|Any CPU
1117
Release|Any CPU = Release|Any CPU
1218
EndGlobalSection
1319
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{3DFD2771-F0CF-4001-9B93-46FDC0A95C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{3DFD2771-F0CF-4001-9B93-46FDC0A95C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{3DFD2771-F0CF-4001-9B93-46FDC0A95C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{3DFD2771-F0CF-4001-9B93-46FDC0A95C8C}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{AA855773-7A61-4190-91B9-20B608AD2DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{AA855773-7A61-4190-91B9-20B608AD2DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{AA855773-7A61-4190-91B9-20B608AD2DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{AA855773-7A61-4190-91B9-20B608AD2DA4}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{4A9818BF-B338-4EBA-9257-DADF300CD740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{4A9818BF-B338-4EBA-9257-DADF300CD740}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{4A9818BF-B338-4EBA-9257-DADF300CD740}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{4A9818BF-B338-4EBA-9257-DADF300CD740}.Release|Any CPU.Build.0 = Release|Any CPU
1828
EndGlobalSection
1929
GlobalSection(SolutionProperties) = preSolution
2030
HideSolutionNode = FALSE
2131
EndGlobalSection
2232
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {B5BF5980-94A6-45DE-9448-C3E111B14939}
33+
SolutionGuid = {299D58C1-E824-455C-987E-B02A348FE573}
2434
EndGlobalSection
2535
EndGlobal

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
# NFive Session Manager Plugin
1+
# NFive Session Manager
2+
NFive server session manager plugin
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
1+
using System;
22
using CitizenFX.Core.Native;
33
using JetBrains.Annotations;
44
using NFive.SDK.Core.Controllers;
55

6-
namespace NFive.SessionManager
6+
namespace NFive.SessionManager.Server
77
{
88
[PublicAPI]
99
public class Configuration : ControllerConfiguration

Deferrals.cs renamed to SessionManager.Server/Deferrals.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using System.Dynamic;
22
using System.Linq;
33
using CitizenFX.Core;
4+
using JetBrains.Annotations;
45

5-
namespace NFive.SessionManager
6+
namespace NFive.SessionManager.Server
67
{
8+
[PublicAPI]
79
public class Deferrals
810
{
911
public CallbackDelegate Defer;

Migrations/201809090203537_Init.Designer.cs renamed to SessionManager.Server/Migrations/201812082353575_Init.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Migrations/201809090203537_Init.cs renamed to SessionManager.Server/Migrations/201812082353575_Init.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace NFive.SessionManager.Migrations
1+
namespace NFive.SessionManager.Server.Migrations
22
{
33
using System;
44
using System.Data.Entity.Migrations;
@@ -22,6 +22,7 @@ public override void Up()
2222
.PrimaryKey(t => t.Id)
2323
.ForeignKey("dbo.Users", t => t.UserId, cascadeDelete: true)
2424
.Index(t => t.UserId);
25+
2526
}
2627

2728
public override void Down()

Migrations/201809090203537_Init.resx renamed to SessionManager.Server/Migrations/201812082353575_Init.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="Target" xml:space="preserve">
121-
<value>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</value>
121+
<value>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</value>
122122
</data>
123123
<data name="DefaultSchema" xml:space="preserve">
124124
<value>dbo</value>

Migrations/Configuration.cs renamed to SessionManager.Server/Migrations/Configuration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using JetBrains.Annotations;
22
using NFive.SDK.Server.Migrations;
3-
using NFive.SessionManager.Storage;
3+
using NFive.SessionManager.Server.Storage;
44

5-
namespace NFive.SessionManager.Migrations
5+
namespace NFive.SessionManager.Server.Migrations
66
{
77
[UsedImplicitly]
88
public sealed class Configuration : MigrationConfiguration<StorageContext> { }
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System.Globalization;
2-
using System.Linq;
3-
using CitizenFX.Core;
42
using NFive.SDK.Server.Rpc;
53

6-
namespace NFive.SessionManager.Models
4+
namespace NFive.SessionManager.Server.Models
75
{
86
public class Client : IClient
97
{

0 commit comments

Comments
 (0)