Update to .NET 6 except the both *.GUI-Projects
This commit is contained in:
6
NuGet.Config
Normal file
6
NuGet.Config
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="Telerik UI for WinForms 2022.2.510.0" value="C:\Program Files (x86)\Progress\Telerik UI for WinForms R2 2022\Bin60\NuGet" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<StartupObject>Pilz.Updating.Administration.GUI.My.MyApplication</StartupObject>
|
<StartupObject>Pilz.Updating.Administration.GUI.My.MyApplication</StartupObject>
|
||||||
<RootNamespace>Pilz.Updating.Administration.GUI</RootNamespace>
|
<RootNamespace>Pilz.Updating.Administration.GUI</RootNamespace>
|
||||||
<MyType>WindowsForms</MyType>
|
<MyType>WindowsForms</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
@@ -47,6 +47,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
|
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -54,10 +55,6 @@
|
|||||||
<Reference Include="DevComponents.DotNetBar2">
|
<Reference Include="DevComponents.DotNetBar2">
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="drsPwEnc">
|
|
||||||
<HintPath>..\Shared Libs\drsPwEnc.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Design">
|
<Reference Include="DevComponents.DotNetBar.Design">
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
@@ -72,9 +69,6 @@
|
|||||||
<Reference Include="Pilz.Cryptography">
|
<Reference Include="Pilz.Cryptography">
|
||||||
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
|
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="mscorlib" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
@@ -262,16 +256,12 @@
|
|||||||
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
|
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Costura.Fody" Version="5.3.0">
|
<PackageReference Include="Fody" Version="6.6.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Fody" Version="6.5.1">
|
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Markdig" Version="0.25.0" />
|
<PackageReference Include="Markdig" Version="0.30.2" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
|
||||||
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
|
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>Pilz.Updating.Administration</RootNamespace>
|
<RootNamespace>Pilz.Updating.Administration</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyTitle>Pilz.Updating.Server</AssemblyTitle>
|
<AssemblyTitle>Pilz.Updating.Server</AssemblyTitle>
|
||||||
@@ -39,14 +39,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
<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.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="drsPwEnc">
|
|
||||||
<HintPath>..\Shared Libs\drsPwEnc.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
<Reference Include="Pilz.Cryptography">
|
<Reference Include="Pilz.Cryptography">
|
||||||
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
|
<HintPath>..\Shared Libs\Pilz.Cryptography.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
@@ -104,14 +101,14 @@
|
|||||||
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
|
<ProjectReference Include="..\Pilz.Updating\Pilz.Updating.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Discord.Net" Version="2.4.0" />
|
<PackageReference Include="Discord.Net" Version="3.7.2" />
|
||||||
<PackageReference Include="Markdig" Version="0.25.0" />
|
<PackageReference Include="Markdig" Version="0.30.2" />
|
||||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||||
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
|
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
|
||||||
<PackageReference Include="System.Interactive.Async" Version="5.0.0" />
|
<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
|
||||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
|
||||||
<PackageReference Include="WebDav.Client" Version="2.7.0" />
|
<PackageReference Include="WebDav.Client" Version="2.8.0" />
|
||||||
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
|
<PackageReference Include="Z.ExtensionMethods.WithNamespace" Version="2.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using drsPwEnc;
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Pilz.Cryptography;
|
using Pilz.Cryptography;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -17,18 +16,6 @@ namespace Pilz.Updating.Administration
|
|||||||
public string UpdateInfoFilename { get; set; }
|
public string UpdateInfoFilename { get; set; }
|
||||||
public string Username { 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")]
|
[JsonProperty("PasswordV3")]
|
||||||
public SecureString Password { get; set; }
|
public SecureString Password { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<StartupObject />
|
<StartupObject />
|
||||||
<RootNamespace>SM64_ROM_Manager.Updating.Client.GUI</RootNamespace>
|
<RootNamespace>SM64_ROM_Manager.Updating.Client.GUI</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
<DefineConstants>TRACE</DefineConstants>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Design">
|
<Reference Include="DevComponents.DotNetBar.Design">
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
@@ -58,9 +58,6 @@
|
|||||||
<Reference Include="DevComponents.DotNetBar2">
|
<Reference Include="DevComponents.DotNetBar2">
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="WindowsBase" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
@@ -174,8 +171,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" />
|
<PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" />
|
||||||
<PackageReference Include="HtmlRenderer.WinForms" Version="1.5.0.6" />
|
<PackageReference Include="HtmlRenderer.WinForms" Version="1.5.0.6" />
|
||||||
<PackageReference Include="Markdig" Version="0.25.0" />
|
<PackageReference Include="Markdig" Version="0.30.2" />
|
||||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
|
<Compile Remove="obj\RelMono\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>Pilz.Updating</RootNamespace>
|
<RootNamespace>Pilz.Updating</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyTitle>Pilz.Updating.Client</AssemblyTitle>
|
<AssemblyTitle>Pilz.Updating.Client</AssemblyTitle>
|
||||||
@@ -38,12 +38,10 @@
|
|||||||
<DefineConstants>TRACE;RelMono</DefineConstants>
|
<DefineConstants>TRACE;RelMono</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
<Import Include="System" />
|
<Import Include="System" />
|
||||||
|
|||||||
@@ -60,8 +60,7 @@ namespace Pilz.Updating
|
|||||||
public bool InstallAsAdmin { get; set; } = false;
|
public bool InstallAsAdmin { get; set; } = false;
|
||||||
public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000;
|
public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000;
|
||||||
public bool ForceClosingHostApplication { get; set; } = true;
|
public bool ForceClosingHostApplication { get; set; } = true;
|
||||||
public Color UpdateWindowBaseColor { get; set; } = Color.FromArgb(unchecked((int)0xFFB7472A));
|
public bool UIDarkMode { get; set; } = false;
|
||||||
public Color UpdateWindowCanvasColor { get; set; } = Color.FromArgb(unchecked((int)0xFFFFFFFF));
|
|
||||||
|
|
||||||
// C o n s t r u c t o r s
|
// C o n s t r u c t o r s
|
||||||
|
|
||||||
@@ -248,8 +247,7 @@ namespace Pilz.Updating
|
|||||||
HostApplicationProcessPath = Assembly.GetEntryAssembly().Location,
|
HostApplicationProcessPath = Assembly.GetEntryAssembly().Location,
|
||||||
MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose,
|
MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose,
|
||||||
ForceClosingHostApplication = ForceClosingHostApplication,
|
ForceClosingHostApplication = ForceClosingHostApplication,
|
||||||
UpdateWindowBaseColor = UpdateWindowBaseColor,
|
UIDarkMode = UIDarkMode
|
||||||
UpdateWindowCanvasColor = UpdateWindowCanvasColor
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Start UpdateInstaller
|
// Start UpdateInstaller
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>Pilz.Updating.GUIBase</RootNamespace>
|
<RootNamespace>Pilz.Updating.GUIBase</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyTitle>Pilz.Updating.GUIBase</AssemblyTitle>
|
<AssemblyTitle>Pilz.Updating.GUIBase</AssemblyTitle>
|
||||||
@@ -37,15 +37,14 @@
|
|||||||
<DefineConstants>TRACE;RelMono</DefineConstants>
|
<DefineConstants>TRACE;RelMono</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
<Reference Include="DevComponents.DotNetBar2">
|
<Reference Include="DevComponents.DotNetBar2">
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
|
|||||||
190
Pilz.Updating.UpdateInstaller/Main.Designer.cs
generated
190
Pilz.Updating.UpdateInstaller/Main.Designer.cs
generated
@@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices;
|
|||||||
namespace Pilz.Updating.UpdateInstaller
|
namespace Pilz.Updating.UpdateInstaller
|
||||||
{
|
{
|
||||||
[DesignerGenerated()]
|
[DesignerGenerated()]
|
||||||
public partial class Main : DevComponents.DotNetBar.OfficeForm
|
public partial class Main : Telerik.WinControls.UI.RadForm
|
||||||
{
|
{
|
||||||
|
|
||||||
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||||
@@ -37,114 +37,108 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
|
||||||
this._ProgressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX();
|
|
||||||
this._Panel1 = new System.Windows.Forms.Panel();
|
this._Panel1 = new System.Windows.Forms.Panel();
|
||||||
this._LabelX_Header = new DevComponents.DotNetBar.LabelX();
|
this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar();
|
||||||
this._LabelX_Status = new DevComponents.DotNetBar.LabelX();
|
this.dotsLineWaitingBarIndicatorElement1 = new Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement();
|
||||||
|
this.radLabel_Status = new Telerik.WinControls.UI.RadLabel();
|
||||||
|
this.radLabel_Header = new Telerik.WinControls.UI.RadLabel();
|
||||||
this._Panel1.SuspendLayout();
|
this._Panel1.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).BeginInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).BeginInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// _ProgressBarX1
|
|
||||||
//
|
|
||||||
this._ProgressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
this._ProgressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
|
||||||
this._ProgressBarX1.Location = new System.Drawing.Point(3, 94);
|
|
||||||
this._ProgressBarX1.Name = "_ProgressBarX1";
|
|
||||||
this._ProgressBarX1.ProgressType = DevComponents.DotNetBar.eProgressItemType.Marquee;
|
|
||||||
this._ProgressBarX1.Size = new System.Drawing.Size(628, 16);
|
|
||||||
this._ProgressBarX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
|
||||||
this._ProgressBarX1.TabIndex = 0;
|
|
||||||
//
|
|
||||||
// _Panel1
|
// _Panel1
|
||||||
//
|
//
|
||||||
this._Panel1.BackColor = System.Drawing.Color.Transparent;
|
this._Panel1.BackColor = System.Drawing.Color.Transparent;
|
||||||
this._Panel1.Controls.Add(this._LabelX_Header);
|
this._Panel1.Controls.Add(this.radWaitingBar1);
|
||||||
this._Panel1.Controls.Add(this._LabelX_Status);
|
this._Panel1.Controls.Add(this.radLabel_Status);
|
||||||
this._Panel1.Controls.Add(this._ProgressBarX1);
|
this._Panel1.Controls.Add(this.radLabel_Header);
|
||||||
this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this._Panel1.Location = new System.Drawing.Point(0, 0);
|
this._Panel1.Location = new System.Drawing.Point(0, 0);
|
||||||
this._Panel1.Name = "_Panel1";
|
this._Panel1.Name = "_Panel1";
|
||||||
this._Panel1.Size = new System.Drawing.Size(634, 111);
|
this._Panel1.Size = new System.Drawing.Size(692, 106);
|
||||||
this._Panel1.TabIndex = 1;
|
this._Panel1.TabIndex = 1;
|
||||||
//
|
//
|
||||||
// _LabelX_Header
|
// radWaitingBar1
|
||||||
//
|
//
|
||||||
this._LabelX_Header.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
this.radWaitingBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||||
|
this.radWaitingBar1.Location = new System.Drawing.Point(3, 85);
|
||||||
|
this.radWaitingBar1.Name = "radWaitingBar1";
|
||||||
|
this.radWaitingBar1.Size = new System.Drawing.Size(130, 18);
|
||||||
|
this.radWaitingBar1.TabIndex = 3;
|
||||||
|
this.radWaitingBar1.Text = "radWaitingBar1";
|
||||||
|
this.radWaitingBar1.WaitingIndicators.Add(this.dotsLineWaitingBarIndicatorElement1);
|
||||||
|
this.radWaitingBar1.WaitingSpeed = 80;
|
||||||
|
this.radWaitingBar1.WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
|
||||||
|
((Telerik.WinControls.UI.RadWaitingBarElement)(radWaitingBar1.GetChildAt(0))).WaitingSpeed = 80;
|
||||||
|
((Telerik.WinControls.UI.WaitingBarContentElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0))).WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
|
||||||
|
((Telerik.WinControls.UI.WaitingBarSeparatorElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Dash = false;
|
||||||
|
//
|
||||||
|
// dotsLineWaitingBarIndicatorElement1
|
||||||
|
//
|
||||||
|
this.dotsLineWaitingBarIndicatorElement1.Name = "dotsLineWaitingBarIndicatorElement1";
|
||||||
|
//
|
||||||
|
// radLabel_Status
|
||||||
|
//
|
||||||
|
this.radLabel_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
|
this.radLabel_Status.AutoSize = false;
|
||||||
|
this.radLabel_Status.Location = new System.Drawing.Point(139, 85);
|
||||||
|
this.radLabel_Status.Name = "radLabel_Status";
|
||||||
|
this.radLabel_Status.Size = new System.Drawing.Size(550, 18);
|
||||||
|
this.radLabel_Status.TabIndex = 2;
|
||||||
|
this.radLabel_Status.Text = "Idle ...";
|
||||||
//
|
//
|
||||||
|
// radLabel_Header
|
||||||
//
|
//
|
||||||
//
|
this.radLabel_Header.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
this._LabelX_Header.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
this._LabelX_Header.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
||||||
this._LabelX_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
|
|
||||||
this._LabelX_Header.Location = new System.Drawing.Point(3, 3);
|
|
||||||
this._LabelX_Header.Name = "_LabelX_Header";
|
|
||||||
this._LabelX_Header.Size = new System.Drawing.Size(628, 56);
|
|
||||||
this._LabelX_Header.TabIndex = 3;
|
|
||||||
this._LabelX_Header.Text = "<div align=\"center\" valign=\"center\"><font color=\"#B7472A\" size=\"20\"><b>SM64 ROM M" +
|
|
||||||
"anager wird aktuallisierung ...</b></font></div>";
|
|
||||||
//
|
|
||||||
// _LabelX_Status
|
|
||||||
//
|
|
||||||
this._LabelX_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
//
|
this.radLabel_Header.AutoSize = false;
|
||||||
//
|
this.radLabel_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
|
||||||
//
|
this.radLabel_Header.Location = new System.Drawing.Point(3, 3);
|
||||||
this._LabelX_Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.radLabel_Header.Name = "radLabel_Header";
|
||||||
this._LabelX_Status.Location = new System.Drawing.Point(3, 65);
|
this.radLabel_Header.Size = new System.Drawing.Size(686, 76);
|
||||||
this._LabelX_Status.Name = "_LabelX_Status";
|
this.radLabel_Header.TabIndex = 1;
|
||||||
this._LabelX_Status.Size = new System.Drawing.Size(628, 23);
|
this.radLabel_Header.Text = "<html><span style=\"font-size: 18pt; color: #b7472a\"><b>SM64 ROM Manager wird aktu" +
|
||||||
this._LabelX_Status.TabIndex = 2;
|
"allisierung ...</b></span></html>";
|
||||||
this._LabelX_Status.Text = "Idle ...";
|
this.radLabel_Header.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
|
this.radLabel_Header.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
|
||||||
//
|
//
|
||||||
// Main
|
// Main
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleBaseSize = new System.Drawing.Size(7, 15);
|
||||||
|
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(634, 111);
|
this.ClientSize = new System.Drawing.Size(692, 106);
|
||||||
this.Controls.Add(this._Panel1);
|
this.Controls.Add(this._Panel1);
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
this.MaximizeBox = false;
|
this.MaximizeBox = false;
|
||||||
this.MinimizeBox = false;
|
this.MinimizeBox = false;
|
||||||
this.Name = "Main";
|
this.Name = "Main";
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
this.RootElement.ApplyShapeToControl = true;
|
||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||||
this.Text = "Installing";
|
this.Text = "Installing";
|
||||||
this._Panel1.ResumeLayout(false);
|
this._Panel1.ResumeLayout(false);
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).EndInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).EndInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private DevComponents.DotNetBar.Controls.ProgressBarX _ProgressBarX1;
|
|
||||||
|
|
||||||
internal DevComponents.DotNetBar.Controls.ProgressBarX ProgressBarX1
|
|
||||||
{
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return _ProgressBarX1;
|
|
||||||
}
|
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_ProgressBarX1 != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
_ProgressBarX1 = value;
|
|
||||||
if (_ProgressBarX1 != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Panel _Panel1;
|
private Panel _Panel1;
|
||||||
|
private Telerik.WinControls.UI.RadLabel radLabel_Status;
|
||||||
|
private Telerik.WinControls.UI.RadLabel radLabel_Header;
|
||||||
|
private Telerik.WinControls.UI.RadWaitingBar radWaitingBar1;
|
||||||
|
private Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement dotsLineWaitingBarIndicatorElement1;
|
||||||
|
|
||||||
internal Panel Panel1
|
internal Panel Panel1
|
||||||
{
|
{
|
||||||
@@ -167,53 +161,5 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private DevComponents.DotNetBar.LabelX _LabelX_Status;
|
|
||||||
|
|
||||||
internal DevComponents.DotNetBar.LabelX LabelX_Status
|
|
||||||
{
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return _LabelX_Status;
|
|
||||||
}
|
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_LabelX_Status != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
_LabelX_Status = value;
|
|
||||||
if (_LabelX_Status != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private DevComponents.DotNetBar.LabelX _LabelX_Header;
|
|
||||||
|
|
||||||
internal DevComponents.DotNetBar.LabelX LabelX_Header
|
|
||||||
{
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return _LabelX_Header;
|
|
||||||
}
|
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.Synchronized)]
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_LabelX_Header != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
_LabelX_Header = value;
|
|
||||||
if (_LabelX_Header != null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,8 @@ using System.Linq;
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using global::DevComponents.DotNetBar;
|
using Telerik.WinControls;
|
||||||
|
using Telerik.WinControls.Themes;
|
||||||
|
|
||||||
namespace Pilz.Updating.UpdateInstaller
|
namespace Pilz.Updating.UpdateInstaller
|
||||||
{
|
{
|
||||||
@@ -32,9 +33,8 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
// Init Style
|
// Init Style
|
||||||
StyleManager.Style = eStyle.Office2016;
|
RadThemeComponentBase themeToUse = Installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme();
|
||||||
StyleManager.MetroColorGeneratorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(Installer.Configuration.UpdateWindowCanvasColor, Installer.Configuration.UpdateWindowBaseColor);
|
ThemeResolutionService.ApplicationThemeName = themeToUse.ThemeName;
|
||||||
StyleManager.UpdateAmbientColors(this);
|
|
||||||
|
|
||||||
// Init Application Header Text
|
// Init Application Header Text
|
||||||
string header;
|
string header;
|
||||||
@@ -47,7 +47,8 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning;
|
header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning;
|
||||||
}
|
}
|
||||||
|
|
||||||
LabelX_Header.Text = $"<div align=\"center\" valign=\"center\"><font color=\"#B7472A\" size=\"20\"><b>{header}</b></font></div>";
|
radLabel_Header.Text = $"<div align=\"center\" valign=\"center\"><font color=\"#B7472A\" size=\"20\"><b>{header}</b></font></div>";
|
||||||
|
radLabel_Header.Text = $"<html><span style=\"font-size: 18pt; color: #b7472a\"><b>{header}</b></span></html>";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Installer is null)
|
if (Installer is null)
|
||||||
@@ -131,8 +132,8 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
LabelX_Status.Text = newStatusText;
|
radLabel_Status.Text = newStatusText;
|
||||||
LabelX_Status.Image = newStatusImage;
|
radLabel_Status.Image = newStatusImage;
|
||||||
|
|
||||||
//if (newStatus == UpdateInstallerStatus.Done)
|
//if (newStatus == UpdateInstallerStatus.Done)
|
||||||
//{
|
//{
|
||||||
|
|||||||
@@ -1,64 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<root>
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<StartupObject>Pilz.Updating.UpdateInstaller.My.MyApplication</StartupObject>
|
<StartupObject>Pilz.Updating.UpdateInstaller.My.MyApplication</StartupObject>
|
||||||
<RootNamespace>Pilz.Updating.UpdateInstaller</RootNamespace>
|
<RootNamespace>Pilz.Updating.UpdateInstaller</RootNamespace>
|
||||||
<MyType>WindowsForms</MyType>
|
<MyType>WindowsForms</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
@@ -46,22 +46,13 @@
|
|||||||
<DefineConstants>TRACE;RelMono</DefineConstants>
|
<DefineConstants>TRACE;RelMono</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
|
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
|
||||||
<ItemGroup>
|
<Version>2022.2.510.0</Version>
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
</PackageReference>
|
||||||
<Reference Include="DevComponents.DotNetBar.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
|
||||||
<Private>False</Private>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar2">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="mscorlib" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
@@ -78,9 +69,7 @@
|
|||||||
<Import Include="Z.IO.Extensions" />
|
<Import Include="Z.IO.Extensions" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Update="Main.cs">
|
<Compile Update="Main.cs" />
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Main.Designer.cs">
|
<Compile Update="Main.Designer.cs">
|
||||||
<DependentUpon>Main.cs</DependentUpon>
|
<DependentUpon>Main.cs</DependentUpon>
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>Pilz.Updating</RootNamespace>
|
<RootNamespace>Pilz.Updating</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyTitle>Pilz.Updating</AssemblyTitle>
|
<AssemblyTitle>Pilz.Updating</AssemblyTitle>
|
||||||
@@ -38,12 +38,10 @@
|
|||||||
<DefineConstants>TRACE;RelMono</DefineConstants>
|
<DefineConstants>TRACE;RelMono</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
<Import Include="System" />
|
<Import Include="System" />
|
||||||
|
|||||||
@@ -14,8 +14,7 @@ namespace Pilz.Updating.UpdateInstaller
|
|||||||
public string HostApplicationProcessPath { get; set; }
|
public string HostApplicationProcessPath { get; set; }
|
||||||
public bool ForceClosingHostApplication { get; set; }
|
public bool ForceClosingHostApplication { get; set; }
|
||||||
public uint MillisecondsToWaitForHostApplicationToClose { get; set; }
|
public uint MillisecondsToWaitForHostApplicationToClose { get; set; }
|
||||||
public Color UpdateWindowBaseColor { get; set; }
|
public bool UIDarkMode { get; set; }
|
||||||
public Color UpdateWindowCanvasColor { get; set; }
|
|
||||||
public ApplicationVersion CurrentApplicationVersion { get; set; }
|
public ApplicationVersion CurrentApplicationVersion { get; set; }
|
||||||
public ApplicationVersion NewApplicationVersion { get; set; }
|
public ApplicationVersion NewApplicationVersion { get; set; }
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user