修复更新程序的工具类引用

Fork.Net/Fork.Net.sln

@@ -13,6 +13,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Skin", "Y.Skin\Y.Skin.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Test", "Y.Test\Y.Test.csproj", "{E1897235-0E04-420D-B6D5-29BEA14DA1FD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Winform.Version", "Winform.Version", "{F32378B4-3DDB-491A-8485-20634188C0FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version.Builder", "Version.Builder\Version.Builder.csproj", "{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version.Update", "Version.Update\Version.Update.csproj", "{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fork.Net.Tools", "Fork.Net.Tools", "{F222E566-DA0C-443C-BB9F-80536F02DB36}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Utils.Net20", "Y.Utils.Net20\Y.Utils.Net20.csproj", "{EE89927C-03A6-4E57-B69A-DE71B101FCA7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fork.Net.Skin", "Fork.Net.Skin", "{BF970206-CAA8-46C3-9F1A-46BB82D51DC4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Controls.Net20", "Y.Controls.Net20\Y.Controls.Net20.csproj", "{490E9BE8-814D-4617-8271-41A73C373F7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.DB", "Y.DB\Y.DB.csproj", "{3ECA2CC6-55C2-433F-A617-A7376E455F7C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fork.Net.Test", "Fork.Net.Test", "{C799B325-3EE8-447B-ACFE-9BA8D157A2CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,8 +57,38 @@ Global
 		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE89927C-03A6-4E57-B69A-DE71B101FCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE89927C-03A6-4E57-B69A-DE71B101FCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE89927C-03A6-4E57-B69A-DE71B101FCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE89927C-03A6-4E57-B69A-DE71B101FCA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{490E9BE8-814D-4617-8271-41A73C373F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{490E9BE8-814D-4617-8271-41A73C373F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{490E9BE8-814D-4617-8271-41A73C373F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{490E9BE8-814D-4617-8271-41A73C373F7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5B8EEEC7-AEB5-407D-9DC1-1C59E53F78D5} = {F222E566-DA0C-443C-BB9F-80536F02DB36}
+		{E10EC8D2-22E2-4387-9D9B-36A5429B67C1} = {BF970206-CAA8-46C3-9F1A-46BB82D51DC4}
+		{E9A97673-3E27-4A49-90BC-8806411A2F57} = {BF970206-CAA8-46C3-9F1A-46BB82D51DC4}
+		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B} = {F32378B4-3DDB-491A-8485-20634188C0FD}
+		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E} = {F32378B4-3DDB-491A-8485-20634188C0FD}
+		{EE89927C-03A6-4E57-B69A-DE71B101FCA7} = {F222E566-DA0C-443C-BB9F-80536F02DB36}
+		{490E9BE8-814D-4617-8271-41A73C373F7D} = {BF970206-CAA8-46C3-9F1A-46BB82D51DC4}
+		{3ECA2CC6-55C2-433F-A617-A7376E455F7C} = {F222E566-DA0C-443C-BB9F-80536F02DB36}
+	EndGlobalSection
 EndGlobal

Fork.Net/Version.Builder/Form1.cs

@@ -1,13 +1,14 @@
-using ShopSystem.Model.Sys;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Y.Utils.BaseUtils;
-using Y.Utils.FileUtils;
-using Y.Utils.JsonUtils;
-using Y.Utils.TxtUtils;
+using Version.Builder.Models;
+using Y.Utils.DataUtils.Collections;
+using Y.Utils.DataUtils.JsonUtils;
+using Y.Utils.IOUtils.FileUtils;
+using Y.Utils.IOUtils.PathUtils;
+using Y.Utils.IOUtils.TxtUtils;
 
 namespace Version.Builder
 {
@@ -28,7 +29,7 @@ namespace Version.Builder
                 beginTime = DateTime.Now;
                 string path = TbPath.Text;
                 string parentPath = DirTool.Parent(path);
-                FileCodeHelper fcode = new FileCodeHelper();
+                FileCodeTool fcode = new FileCodeTool();
                 if (Directory.Exists(path) && Directory.Exists(parentPath))
                 {
                     List<string> fileList = FileTool.GetAllFile(path);

Fork.Net/Version.Builder/Models/VersionModel.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Version.Builder.Models
+{
+    public class VersionModel
+    {
+        public int Number { get; set; }
+        public string Path { get; set; }
+        public bool Clean { get; set; }
+        public List<VersionFile> FileList { get; set; }
+    }
+    public class VersionFile
+    {
+        public string File { get; set; }
+        public string MD5 { get; set; }
+    }
+}

Fork.Net/Version.Builder/Version.Builder.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Models\VersionModel.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Form1.resx">
@@ -85,6 +86,12 @@
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Y.Utils\Y.Utils.csproj">
+      <Project>{5b8eeec7-aeb5-407d-9dc1-1c59e53f78d5}</Project>
+      <Name>Y.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.1.28.3\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.3\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Fork.Net/Version.Update/Form1.cs

@@ -1,12 +1,13 @@
-using ShopSystem.Model.Sys;
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Y.Utils.FileUtils;
-using Y.Utils.JsonUtils;
-using Y.Utils.NetworkUtils;
+using Version.Update.Models;
+using Y.Utils.DataUtils.JsonUtils;
+using Y.Utils.IOUtils.FileUtils;
+using Y.Utils.IOUtils.PathUtils;
+using Y.Utils.NetUtils.FTPUtils;
 
 namespace Version.Update
 {
@@ -80,7 +81,7 @@ namespace Version.Update
         {
             if (DirTool.Create(downloadPath))
             {
-                FileCodeHelper fcode = new FileCodeHelper();
+                FileCodeTool fcode = new FileCodeTool();
                 for (int i = 0; i < version.FileList.Count; i++)
                 {
                     string fileName = Path.GetFileName(version.FileList[i].File);
@@ -126,7 +127,7 @@ namespace Version.Update
         {
             if (DirTool.Create(backupPath))
             {
-                FileCodeHelper fcode = new FileCodeHelper();
+                FileCodeTool fcode = new FileCodeTool();
                 for (int i = 0; i < version.FileList.Count; i++)
                 {
                     string fileName = Path.GetFileName(version.FileList[i].File);

Fork.Net/Version.Update/Models/VersionModel.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Version.Update.Models
+{
+    public class VersionModel
+    {
+        public int Number { get; set; }
+        public string Path { get; set; }
+        public bool Clean { get; set; }
+        public List<VersionFile> FileList { get; set; }
+    }
+    public class VersionFile
+    {
+        public string File { get; set; }
+        public string MD5 { get; set; }
+    }
+}

Fork.Net/Version.Update/Version.Update.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Models\VersionModel.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Form1.resx">
@@ -87,10 +88,6 @@
       <Project>{5b8eeec7-aeb5-407d-9dc1-1c59e53f78d5}</Project>
       <Name>Y.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ShopSystem.Model\ShopSystem.Model.csproj">
-      <Project>{c6c61b66-6646-4f69-af3d-f69115945b5a}</Project>
-      <Name>ShopSystem.Model</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />

Fork.Net/Y.Skin/YoForm/Irregular/IrregularForm.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
+//############################################################
+//      https://github.com/yuzhengyang
+//      author:yuzhengyang
+//############################################################
+using System;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;

Fork.Net/Y.Skin/YoForm/Toast/ToastForm.cs

@@ -1,20 +1,25 @@
-using System;
+//############################################################
+//      https://github.com/yuzhengyang
+//      author:yuzhengyang
+//############################################################
+using System;
 using System.Windows.Forms;
 
-
-//ToastForm _ToastForm = null;
-//public void Toast(string s = "")
-//{
-//    if (_ToastForm == null || _ToastForm.IsDisposed)
-//        _ToastForm = new ToastForm(this);
-
-//    _ToastForm.Toast(s);
-//}
-
 namespace Y.Skin.YoForm.Toast
 {
     public partial class ToastForm : Form
     {
+        #region How to use?
+        //ToastForm _ToastForm = null;
+        //public void Toast(string s = "")
+        //{
+        //    if (_ToastForm == null || _ToastForm.IsDisposed)
+        //        _ToastForm = new ToastForm(this);
+
+        //    _ToastForm.Toast(s);
+        //}
+        #endregion
+
         Form BaseForm;
         DateTime HideTime = DateTime.Now;
         int Showtime = 5;

Fork.Net/Y.Test/Views/MainForm.Designer.cs

@@ -38,12 +38,13 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(169, 176);
+            this.button1.Location = new System.Drawing.Point(93, 176);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 0;
             this.button1.Text = "button1";
             this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // checkBox1
             // 
@@ -96,6 +97,7 @@
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MainForm";
+            this.Load += new System.EventHandler(this.MainForm_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
 

Fork.Net/Y.Test/Views/MainForm.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Y.Skin.YoForm.Irregular;
+using Y.Skin.YoForm.Toast;
 
 namespace Y.Test.Views
 {
@@ -22,5 +23,23 @@ namespace Y.Test.Views
         {
             Close();
         }
+
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        ToastForm _ToastForm = null;
+        public void Toast(string s = "")
+        {
+            if (_ToastForm == null || _ToastForm.IsDisposed)
+                _ToastForm = new ToastForm(this);
+
+            _ToastForm.Toast(s);
+        }
+        private void button1_Click(object sender, EventArgs e)
+        {
+            Toast("");
+        }
     }
 }

Fork.Net/packages/Costura.Fody.1.3.3.0/Content/FodyWeavers.xml.install.xdt

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <Costura xdt:Transform="Insert" />
+</Weavers>

Fork.Net/packages/Costura.Fody.1.3.3.0/Content/FodyWeavers.xml.uninstall.xdt

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <Costura xdt:Transform="Remove" />
+</Weavers>

Fork.Net/packages/Costura.Fody.1.3.3.0/Tools/commands.psm1

@@ -0,0 +1,106 @@
+function Resolve-ProjectName {
+    param(
+        [parameter(ValueFromPipelineByPropertyName = $true)]
+        [string[]]$ProjectName
+    )
+    
+    if($ProjectName) {
+        $projects = Get-Project $ProjectName
+    }
+    else {
+        # All projects by default
+        $projects = Get-Project
+    }
+    
+    $projects
+}
+
+function Get-MSBuildProject {
+    param(
+        [parameter(ValueFromPipelineByPropertyName = $true)]
+        [string[]]$ProjectName
+    )
+    Process {
+        (Resolve-ProjectName $ProjectName) | % {
+            $path = $_.FullName
+            @([Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($path))[0]
+        }
+    }
+}
+
+function Install-CleanReferencesTarget()
+{
+    $buildProject = Get-MSBuildProject
+
+    if ($buildProject.Xml.Targets | Where-Object { "CleanReferenceCopyLocalPaths" -contains $_.Name })
+    {
+        Write-Host "Target CleanReferenceCopyLocalPaths already exists." -foregroundcolor Black -backgroundcolor Yellow
+
+        return
+    }
+
+    $usingTask = $buildProject.Xml.AddUsingTask("CosturaCleanup", "`$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll", "")
+	$usingTask.TaskFactory = "CodeTaskFactory"
+    $parameterGroup = $usingTask.AddParameterGroup()
+    $configParam = $parameterGroup.AddParameter("Config", "false", "true", "Microsoft.Build.Framework.ITaskItem")
+    $filesParam = $parameterGroup.AddParameter("Files", "false", "true", "Microsoft.Build.Framework.ITaskItem[]")
+	$taskBody = $usingTask.AddUsingTaskBody("true", "<Reference xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Include=`"System.Xml`"/>
+      <Reference xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Include=`"System.Xml.Linq`"/>
+      <Using xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Namespace=`"System`"/>
+      <Using xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Namespace=`"System.IO`"/>
+      <Using xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Namespace=`"System.Xml.Linq`"/>
+      <Code xmlns=`"http://schemas.microsoft.com/developer/msbuild/2003`" Type=`"Fragment`" Language=`"cs`">
+<![CDATA[
+var config = XElement.Load(Config.ItemSpec).Elements(`"Costura`").FirstOrDefault();
+
+if (config == null) return true;
+
+var excludedAssemblies = new List<string>();
+var attribute = config.Attribute(`"ExcludeAssemblies`");
+if (attribute != null)
+    foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
+        excludedAssemblies.Add(item);
+var element = config.Element(`"ExcludeAssemblies`");
+if (element != null)
+    foreach (var item in element.Value.Split(new[] { `"\r\n`", `"\n`" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
+        excludedAssemblies.Add(item);
+
+var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));
+
+foreach (var item in filesToCleanup)
+  File.Delete(item);
+]]>
+      </Code>")
+
+    $target = $buildProject.Xml.AddTarget("CleanReferenceCopyLocalPaths")
+    $target.AfterTargets = "AfterBuild;NonWinFodyTarget"
+    $deleteTask = $target.AddTask("CosturaCleanup")
+    $deleteTask.SetParameter("Config", "FodyWeavers.xml")
+    $deleteTask.SetParameter("Files", "@(ReferenceCopyLocalPaths->`'`$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)`')")
+
+    $buildProject.Save()
+
+    Write-Host "Added target CleanReferenceCopyLocalPaths."
+}
+
+function Uninstall-CleanReferencesTarget()
+{
+    $buildProject = Get-MSBuildProject
+
+    $target = $buildProject.Xml.Targets | Where-Object { "CleanReferenceCopyLocalPaths" -contains $_.Name }
+    $usingTask = $buildProject.Xml.UsingTasks | Where-Object { "CosturaCleanup" -contains $_.TaskName }
+
+    if (!$target)
+    {
+        Write-Host "Target CleanReferenceCopyLocalPaths did not exist." -foregroundcolor Black -backgroundcolor Yellow
+
+        return
+    }
+
+    $buildProject.Xml.RemoveChild($usingTask)
+    $buildProject.Xml.RemoveChild($target)
+
+    $buildProject.Save()
+
+    Write-Host "Removed target CleanReferenceCopyLocalPaths."
+}

Fork.Net/packages/Costura.Fody.1.3.3.0/Tools/init.ps1

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+
+Import-Module (Join-Path $toolsPath commands.psm1)

Fork.Net/packages/Fody.1.28.3/Content/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Weavers>
+  
+</Weavers>

Fork.Net/packages/Fody.1.28.3/Tools/install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+
+
+# Need to load MSBuild assembly if it's not loaded yet.
+Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+  
+# Grab the loaded MSBuild project for the project
+$buildProject = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+$fodyPathProperty = $buildProject.GetProperty("FodyPath") 
+
+# Dont do a null check since is seems evaluating the value causes powershit to have a conniption 
+try	
+{
+	$buildProject.RemoveProperty($fodyPathProperty);
+}
+catch{}
+
+$project.Save()
+

Fork.Net/packages/Fody.1.28.3/Tools/uninstall.ps1

@@ -0,0 +1 @@
+param($installPath, $toolsPath, $package, $project)