Switch to CC-Functions.Core

This commit is contained in:
JFronny 2021-02-03 22:42:22 +01:00
parent 536b549114
commit 3ddc958e0b
11 changed files with 8 additions and 17 deletions

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>

View File

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
</ItemGroup> </ItemGroup>

View File

@ -5,7 +5,7 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Reflection; using System.Reflection;
using CC_Functions.Misc; using CC_Functions.Core;
namespace UpTool_build_tool namespace UpTool_build_tool
{ {

View File

@ -15,7 +15,7 @@
<ApplicationIcon>..\UpTool2.ico</ApplicationIcon> <ApplicationIcon>..\UpTool2.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CC-Functions.Misc" Version="1.1.7474.36199" /> <PackageReference Include="CC-Functions.Core" Version="1.1.7628.34181" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -10,7 +10,6 @@ using UpTool2.Task;
using UpToolLib; using UpToolLib;
using UpToolLib.DataStructures; using UpToolLib.DataStructures;
using UpToolLib.Tool; using UpToolLib.Tool;
using System.Threading;
using System.Diagnostics; using System.Diagnostics;
namespace UpTool2 namespace UpTool2

View File

@ -3,10 +3,8 @@ using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using UpTool2.Tool; using UpTool2.Tool;
@ -60,10 +58,6 @@ namespace UpTool2
{ {
Online = false; Online = false;
} }
if (Application.ExecutablePath != PathTool.GetRelative("Install", "UpTool2.dll"))
Splash.Invoke((Action) (() => MessageBox.Show(Splash,
$"WARNING!{Environment.NewLine}Running from outside the install directory is not recommended!")
));
if (!Directory.Exists(PathTool.GetRelative("Apps"))) if (!Directory.Exists(PathTool.GetRelative("Apps")))
Directory.CreateDirectory(PathTool.GetRelative("Apps")); Directory.CreateDirectory(PathTool.GetRelative("Apps"));
if (!Online) if (!Online)

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
@ -20,7 +20,7 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CC-Functions.Misc" Version="1.1.7474.36199" /> <PackageReference Include="CC-Functions.Core" Version="1.1.7628.34181" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\UpToolLib\UpToolLib.csproj" /> <ProjectReference Include="..\UpToolLib\UpToolLib.csproj" />

View File

@ -13,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
</ItemGroup> </ItemGroup>

View File

@ -4,7 +4,6 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Net.Mime;
using UpToolLib.DataStructures; using UpToolLib.DataStructures;
namespace UpToolLib.Tool namespace UpToolLib.Tool

View File

@ -4,7 +4,6 @@ using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
//using CC_Functions.Misc;
using UpToolLib.DataStructures; using UpToolLib.DataStructures;
namespace UpToolLib.Tool namespace UpToolLib.Tool

View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CC-Functions.Misc" Version="1.1.7474.36199" /> <PackageReference Include="CC-Functions.Core" Version="1.1.7628.34181" />
</ItemGroup> </ItemGroup>
</Project> </Project>