Pilz.NET/Pilz.Updating
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to .NET 6 except the both *.GUI-Projects

Browse Source
This commit is contained in:
Pascal
2022-06-10 20:23:07 +02:00
parent 3d08dde114
commit 0661d67148
16 changed files with 121 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Pilz.Updating.Administration/Pilz.Updating.Administration.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>Pilz.Updating.Administration</RootNamespace>
<MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.Server</AssemblyTitle>
@@ -39,14 +39,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
<ItemGroup>
<Reference Include="drsPwEnc">
<HintPath>..\Shared Libs\drsPwEnc.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Pilz.Cryptography">
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
</Reference>
@@ -104,14 +101,14 @@
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Discord.Net" Version="2.4.0" />
<PackageReference Include="Markdig" Version="0.25.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<PackageReference Include="Discord.Net" Version="3.7.2" />
<PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Interactive.Async" Version="5.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageReference Include="WebDav.Client" Version="2.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="WebDav.Client" Version="2.8.0" />
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
</ItemGroup>
<ItemGroup>

15
Pilz.Updating.Administration/UpdateServerConfig.cs
View File

@@ -1,5 +1,4 @@
using drsPwEnc;
using Newtonsoft.Json;
using Newtonsoft.Json;
using Pilz.Cryptography;
using System;
using System.Collections.Generic;
@@ -17,18 +16,6 @@ namespace Pilz.Updating.Administration
public string UpdateInfoFilename { get; set; }
public string Username { get; set; }
[JsonProperty("Password")]
private string PasswordOld
{
set
{
if (string.IsNullOrEmpty(value))
Password = string.Empty;
else
Password = new drsPwEnc.drsPwEnc().DecryptData(value);
}
}
[JsonProperty("PasswordV3")]
public SecureString Password { get; set; }
}