mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Newtonsoft.Json.

Browse Source
This commit is contained in:
Jared Goodwin 2019-09-28 00:30:36 -07:00
parent c9c5b67c4d
commit e0210822c2
19 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Agent/Agent.csproj
View File

@ -30,7 +30,6 @@
<PackageReference Include="Microsoft.WSMan.Management" Version="6.2.3" />
<PackageReference Include="Microsoft.WSMan.Runtime" Version="6.2.3" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Management.Automation" Version="6.2.3" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
</ItemGroup>

8
Desktop.Unix/Services/Config.cs
View File

@ -1,10 +1,10 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
namespace Remotely.Desktop.Unix.Services
@ -25,7 +25,7 @@ namespace Remotely.Desktop.Unix.Services
{
try
{
return JsonConvert.DeserializeObject<Config>(File.ReadAllText(ConfigFile));
return JsonSerializer.Deserialize<Config>(File.ReadAllText(ConfigFile));
}
catch
{
@ -40,7 +40,7 @@ namespace Remotely.Desktop.Unix.Services
try
{
Directory.CreateDirectory(ConfigFolder);
File.WriteAllText(ConfigFile, JsonConvert.SerializeObject(this));
File.WriteAllText(ConfigFile, JsonSerializer.Serialize(this));
}
catch
{

6
Desktop.Win/App.config
View File

@ -19,7 +19,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -29,6 +29,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

3
Desktop.Win/Desktop.Win.csproj
View File

@ -179,9 +179,6 @@
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>

8
Desktop.Win/Services/Config.cs
View File

@ -1,10 +1,10 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
namespace Remotely.Desktop.Win.Services
@ -25,7 +25,7 @@ namespace Remotely.Desktop.Win.Services
{
try
{
return JsonConvert.DeserializeObject<Config>(File.ReadAllText(ConfigFile));
return JsonSerializer.Deserialize<Config>(File.ReadAllText(ConfigFile));
}
catch
{
@ -40,7 +40,7 @@ namespace Remotely.Desktop.Win.Services
try
{
Directory.CreateDirectory(ConfigFolder);
File.WriteAllText(ConfigFile, JsonConvert.SerializeObject(this));
File.WriteAllText(ConfigFile, JsonSerializer.Serialize(this));
}
catch
{

1
Desktop.Win/packages.config
View File

@ -20,7 +20,6 @@
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Options" version="3.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Primitives" version="3.0.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
<package id="System.Buffers" version="4.5.0" targetFramework="net472" />
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net48" />
<package id="System.Drawing.Common" version="4.6.0" targetFramework="net48" />

8
ScreenCast.Core/Services/Logger.cs
View File

@ -1,11 +1,11 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
namespace Remotely.ScreenCast.Core.Services
@ -44,7 +44,7 @@ namespace Remotely.ScreenCast.Core.Services
fi = new FileInfo(path);
}
}
File.AppendAllText(path, JsonConvert.SerializeObject(jsoninfo) + Environment.NewLine);
File.AppendAllText(path, JsonSerializer.Serialize(jsoninfo) + Environment.NewLine);
}
}
catch { }
@ -88,7 +88,7 @@ namespace Remotely.ScreenCast.Core.Services
fi = new FileInfo(path);
}
}
File.AppendAllText(path, JsonConvert.SerializeObject(jsonError) + Environment.NewLine);
File.AppendAllText(path, JsonSerializer.Serialize(jsonError) + Environment.NewLine);
exception = exception.InnerException;
}
}

1
ScreenCast.Linux/ScreenCast.Linux.csproj
View File

@ -34,7 +34,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
</ItemGroup>

6
ScreenCast.Win/App.config
View File

@ -15,7 +15,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -29,6 +29,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

3
ScreenCast.Win/ScreenCast.Win.csproj
View File

@ -179,9 +179,6 @@
<Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
</Reference>

1
ScreenCast.Win/packages.config
View File

@ -21,7 +21,6 @@
<package id="Microsoft.Extensions.Options" version="3.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Primitives" version="3.0.0" targetFramework="net48" />
<package id="NAudio" version="1.9.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
<package id="SharpDX" version="4.2.0" targetFramework="net472" />
<package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net472" />
<package id="SharpDX.DXGI" version="4.2.0" targetFramework="net472" />

2
Server/Data/ApplicationDbContext.cs
View File

@ -40,7 +40,7 @@ namespace Remotely.Server.Data
base.OnModelCreating(builder);
builder.Entity<IdentityUser>().ToTable("RemotelyUsers");
builder.Entity<RemotelyUser>().ToTable("RemotelyUsers");
//builder.Entity<RemotelyUser>().ToTable("RemotelyUsers");
builder.Entity<Organization>()
.HasMany(x => x.Devices)

1
Server/Server.csproj
View File

@ -70,7 +70,6 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
</ItemGroup>

14
Server/Startup.cs
View File

@ -24,7 +24,6 @@ using Remotely.Shared.Services;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Identity.UI;
using Microsoft.AspNetCore.Cors.Infrastructure;
using Swashbuckle.AspNetCore.Swagger;
using Newtonsoft.Json;
using System.Net;
using Microsoft.Extensions.Hosting;
@ -144,11 +143,6 @@ namespace Remotely.Server
})
.AddMessagePackProtocol();
services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1", new Info { Title = "Remotely API", Version = "v1" });
});
services.AddLogging();
services.AddScoped<IEmailSender, EmailSender>();
services.AddScoped<EmailSender>();
@ -191,6 +185,8 @@ namespace Remotely.Server
app.UseAuthentication();
app.UseAuthorization();
app.UseEndpoints(routeBuilder =>
{
@ -220,12 +216,6 @@ namespace Remotely.Server
});
app.UseSwagger();
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "Remotely API V1");
});
app.UseCors("TrustedOriginPolicy");
try

6
Shared/Models/CommandContext.cs
View File

@ -1,8 +1,8 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using System.Text.Json.Serialization;
namespace Remotely.Shared.Models
{
@ -18,7 +18,7 @@ namespace Remotely.Shared.Models
public ICollection<PSCoreCommandResult> PSCoreResults { get; set; } = new List<PSCoreCommandResult>();
public ICollection<GenericCommandResult> CommandResults { get; set; } = new List<GenericCommandResult>();
public DateTime TimeStamp { get; set; } = DateTime.Now;
[IgnoreDataMember]
[JsonIgnore]
public virtual Organization Organization { get; set; }
public string OrganizationID { get; set; }
}

15
Shared/Models/CommandContext.cs.d.ts vendored
View File

@ -1,4 +1,3 @@
declare module server {
interface commandContext {
iD: string;
commandMode: string;
@ -9,6 +8,16 @@ declare module server {
pSCoreResults: any[];
commandResults: any[];
timeStamp: Date;
organization: {
iD: string;
organizationName: string;
remotelyUsers: any[];
devices: any[];
commandContexts: .commandContext[];
eventLogs: any[];
permissionGroups: any[];
inviteLinks: any[];
sharedFiles: any[];
};
organizationID: string;
}
}
}

4
Shared/Models/EventLog.cs
View File

@ -1,8 +1,8 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
using System.Text.Json.Serialization;
namespace Remotely.Shared.Models
{

3
Shared/Models/PermissionGroup.cs
View File

@ -1,5 +1,4 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;

2
Shared/Shared.csproj
View File

@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.0.0" />
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
<PackageReference Include="System.Text.Json" Version="4.6.0" />
</ItemGroup>
<ItemGroup>