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

8
Pilz.Updating.Client/Pilz.Updating.Client.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>Pilz.Updating</RootNamespace>
<MyType>Windows</MyType>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
<LangVersion>latest</LangVersion>
<AssemblyTitle>Pilz.Updating.Client</AssemblyTitle>
@@ -38,12 +38,10 @@
<DefineConstants>TRACE;RelMono</DefineConstants>
</PropertyGroup>
<ItemGroup>
<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="Microsoft.VisualBasic" />
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
<Import Include="System" />

6
Pilz.Updating.Client/UpdateClient.cs
View File

@@ -60,8 +60,7 @@ namespace Pilz.Updating
public bool InstallAsAdmin { get; set; } = false;
public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000;
public bool ForceClosingHostApplication { get; set; } = true;
public Color UpdateWindowBaseColor { get; set; } = Color.FromArgb(unchecked((int)0xFFB7472A));
public Color UpdateWindowCanvasColor { get; set; } = Color.FromArgb(unchecked((int)0xFFFFFFFF));
public bool UIDarkMode { get; set; } = false;
// C o n s t r u c t o r s
@@ -248,8 +247,7 @@ namespace Pilz.Updating
HostApplicationProcessPath = Assembly.GetEntryAssembly().Location,
MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose,
ForceClosingHostApplication = ForceClosingHostApplication,
UpdateWindowBaseColor = UpdateWindowBaseColor,
UpdateWindowCanvasColor = UpdateWindowCanvasColor
UIDarkMode = UIDarkMode
};
// Start UpdateInstaller