Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Client/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
</ItemGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoWarn>MsgPack003;MsgPack004;MsgPack005;MsgPack007;MsgPack011;CS8785</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
</ItemGroup>


Expand Down
4 changes: 4 additions & 0 deletions Client/ClientExtentions/Messaging/Chat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ public Params(List<EntityId> members, string name)
this.Members = members;
this.Name = name;
}

public Params()
{
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Client/ClientExtentions/Messaging/ChatService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private string FileName(EntityId chatId,long messageIndex)
/// Local chat message contains additional iformation like received and watched noticements
/// </summary>
[MessagePackObject]
public class LocalChatMessage : ChatMessage
public partial class LocalChatMessage : ChatMessage
{
public enum Status
{
Expand Down
13 changes: 7 additions & 6 deletions Core/Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Deterministic>false</Deterministic>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
Expand All @@ -11,15 +11,16 @@
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoWarn>MsgPack003;MsgPack004;MsgPack005;MsgPack007;MsgPack011;CS8785</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="RangeTree" Version="2.0.1" />
<PackageReference Include="RestSharp" Version="106.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="RangeTree" Version="3.0.1" />
<PackageReference Include="RestSharp" Version="114.0.0" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion Core/CoreTests/SerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void SourceReferenceRegion () {
public void MultipleObjectWriteTest () {
FileController.WriteLinesAs<int> ("ok", TestInts ());
var read = FileController.ReadLinesAs<int> ("ok");
CollectionAssert.AreEqual(TestInts(),read);
Assert.That(read, Is.EqualTo(TestInts()));
}

private IEnumerable<int> TestInts () {
Expand Down
6 changes: 3 additions & 3 deletions Core/Extentions/KeyValue/KeyValueStore.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Coflnet;
using RangeTree;
using IntervalTree;

namespace Core.Extentions.KeyValue
{
Expand All @@ -9,11 +9,11 @@ namespace Core.Extentions.KeyValue
/// </summary>
public class KeyValueStore : Entity
{
public RangeTree<int,EntityId> Buckets {get;set;}
public IntervalTree<int,EntityId> Buckets {get;set;}

public KeyValueStore()
{
Buckets = new RangeTree<int, EntityId>();
Buckets = new IntervalTree<int, EntityId>();
}


Expand Down
10 changes: 5 additions & 5 deletions Core/Extentions/KeyValue/KeyValueTests/KeyValueTests.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>



<ItemGroup>
<PackageReference Include="MessagePackAnalyzer" Version="2.1.165" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MessagePackAnalyzer" Version="3.1.4" />
<PackageReference Include="nunit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<ProjectReference Include="..\..\..\Core.csproj" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions Core/Scripts/CommandController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Coflnet;
using Coflnet.Server;
using MessagePack;
using RestSharp;

namespace Coflnet
{
Expand Down Expand Up @@ -275,7 +276,7 @@ public override ServerCommand.ServerCommandSettings GetServerSettings () {
/// Represents a command that invokes a external rest api
/// </summary>
public class RestCommand : ServerCommand {
RestSharp.RestClient client = new RestSharp.RestClient ();
RestSharp.RestClient client;
RestCommandRegisterRequest registerRequest;

public override void Execute (CommandData data) {
Expand Down Expand Up @@ -310,7 +311,7 @@ public override ServerCommandSettings GetServerSettings () {

public RestCommand (RestCommandRegisterRequest request) {
registerRequest = request;
client.BaseHost = request.BaseUrl;
client = new RestSharp.RestClient (request.BaseUrl);
}
}

Expand Down
9 changes: 3 additions & 6 deletions Core/Scripts/Services/TrackService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void SendTrackingRequest(string title, bool sendSinceStartup = false)
{
var client = new RestClient(ConfigController.GetUrl("track"));

var request = new RestRequest("resource/{id}", Method.GET);
var request = new RestRequest("resource/{id}", Method.Get);
request.AddParameter("url", title); // adds to POST or URL querystring based on Method
request.AddParameter("title", title);
request.AddParameter("action_name", title);
Expand All @@ -44,11 +44,8 @@ public void SendTrackingRequest(string title, bool sendSinceStartup = false)



// send of
client.ExecuteAsync(request, response =>
{
// done
});
// send off
_ = client.ExecuteAsync(request);

if (sendSinceStartup)
url += GetStartTimeParameter();
Expand Down
6 changes: 3 additions & 3 deletions Server/Core/DataBaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class DBList<T> where T : IDatabaseable

public T Get(string id)
{
RestRequest request = new RestRequest(sprunjeEndpoint, RestSharp.Method.GET);
RestRequest request = new RestRequest(sprunjeEndpoint, RestSharp.Method.Get);
request.AddHeader("Authorization", "blabla");
var client = new RestClient("http://example.com");

Expand All @@ -30,7 +30,7 @@ public T Get(string id)

public T GetT(DateTime start, DateTime end)
{
RestRequest request = new RestRequest(sprunjeEndpoint, RestSharp.Method.GET);
RestRequest request = new RestRequest(sprunjeEndpoint, RestSharp.Method.Get);
request.AddHeader("Authorization", "blabla");
var client = new RestClient("http://example.com");

Expand Down Expand Up @@ -61,7 +61,7 @@ public CommandData Get(long id)
}

// wasn't found, search the DB over the rest API next
RestRequest request = new RestRequest(RestSharp.Method.GET);
RestRequest request = new RestRequest();
request.AddHeader("Authorization", user.AuthToken);
request.AddHeader("messageId", id.ToString());
var result = messageEndpoint.Execute(request);
Expand Down
9 changes: 5 additions & 4 deletions Server/Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
</ItemGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoWarn>MsgPack003;MsgPack004;MsgPack005;MsgPack007;MsgPack011;CS8785</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.90" />
<PackageReference Include="MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="RestSharp" Version="106.12.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="RestSharp" Version="114.0.0" />
</ItemGroup>

</Project>
9 changes: 4 additions & 5 deletions dev/dev.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.90" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="MessagePack" Version="3.1.4" />
<PackageReference Include="NUnit" Version="4.5.1" />
</ItemGroup>

<PropertyGroup>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>netcoreapp2.2</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>net10.0</TargetFramework>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoWarn>MsgPack003;MsgPack004;MsgPack005;MsgPack007;MsgPack011;CS8785</NoWarn>
</PropertyGroup>

</Project>