添加Http下载文件进度回调

Fork.Net/Fork.Net.sln

@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Controls", "Y.Controls\Y.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Skin", "Y.Skin\Y.Skin.csproj", "{E9A97673-3E27-4A49-90BC-8806411A2F57}"
 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}"
@@ -31,10 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{A89FC45A-A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Oreo.Plugins", "Oreo.Plugins", "{E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PacketMonitor", "PacketMonitor\PacketMonitor.csproj", "{82B0FE94-1339-42C8-953F-E400CF9F1FF2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.WpfApplication1", "Test.WpfApplication1\Test.WpfApplication1.csproj", "{9B9BF25E-0ECD-4923-9546-4FDAEF685092}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oreo.CleverDog", "Oreo.Plugins\Oreo.CleverDog\Oreo.CleverDog.csproj", "{A7365B83-32FF-4B92-8C80-A450AC92007F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oreo.FileMan", "Oreo.Plugins\Oreo.FileMan\Oreo.FileMan.csproj", "{44A1823B-EA31-4BAF-B264-0471C149D703}"
@@ -57,6 +51,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oreo.VersionBuilder.Control
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oreo.VersionUpdate.Control", "Oreo.Plugins\Oreo.VersionUpdate.Control\Oreo.VersionUpdate.Control.csproj", "{B48DFBE0-C3D0-4FE7-9F9F-1663FBFC7482}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PacketMonitor", "Test\PacketMonitor\PacketMonitor.csproj", "{82B0FE94-1339-42C8-953F-E400CF9F1FF2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.WpfApplication1", "Test\Test.WpfApplication1\Test.WpfApplication1.csproj", "{9B9BF25E-0ECD-4923-9546-4FDAEF685092}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Y.Test", "Test\Y.Test\Y.Test.csproj", "{E1897235-0E04-420D-B6D5-29BEA14DA1FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,14 +97,6 @@ Global
 		{E9A97673-3E27-4A49-90BC-8806411A2F57}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9A97673-3E27-4A49-90BC-8806411A2F57}.Release|x86.ActiveCfg = Release|Any CPU
 		{E9A97673-3E27-4A49-90BC-8806411A2F57}.Release|x86.Build.0 = Release|Any CPU
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|x86.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
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|x86.ActiveCfg = Release|Any CPU
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -129,22 +121,6 @@ Global
 		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Release|x86.ActiveCfg = Release|Any CPU
 		{3ECA2CC6-55C2-433F-A617-A7376E455F7C}.Release|x86.Build.0 = Release|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|x86.Build.0 = Release|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|x86.Build.0 = Debug|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|x86.ActiveCfg = Release|Any CPU
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|x86.Build.0 = Release|Any CPU
 		{A7365B83-32FF-4B92-8C80-A450AC92007F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7365B83-32FF-4B92-8C80-A450AC92007F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7365B83-32FF-4B92-8C80-A450AC92007F}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -233,6 +209,30 @@ Global
 		{B48DFBE0-C3D0-4FE7-9F9F-1663FBFC7482}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B48DFBE0-C3D0-4FE7-9F9F-1663FBFC7482}.Release|x86.ActiveCfg = Release|Any CPU
 		{B48DFBE0-C3D0-4FE7-9F9F-1663FBFC7482}.Release|x86.Build.0 = Release|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Debug|x86.Build.0 = Debug|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|x86.ActiveCfg = Release|Any CPU
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2}.Release|x86.Build.0 = Release|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092}.Release|x86.Build.0 = Release|Any CPU
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Debug|x86.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
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -241,12 +241,9 @@ Global
 		{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}
-		{E1897235-0E04-420D-B6D5-29BEA14DA1FD} = {A89FC45A-A907-4487-8719-114530A62684}
 		{10F1E19E-AEBA-4835-9A58-F02BEC46FF4B} = {F32378B4-3DDB-491A-8485-20634188C0FD}
 		{0DFAC9FC-9D48-4DCF-AE72-8FB1CA70A06E} = {F32378B4-3DDB-491A-8485-20634188C0FD}
 		{3ECA2CC6-55C2-433F-A617-A7376E455F7C} = {F222E566-DA0C-443C-BB9F-80536F02DB36}
-		{82B0FE94-1339-42C8-953F-E400CF9F1FF2} = {A89FC45A-A907-4487-8719-114530A62684}
-		{9B9BF25E-0ECD-4923-9546-4FDAEF685092} = {A89FC45A-A907-4487-8719-114530A62684}
 		{A7365B83-32FF-4B92-8C80-A450AC92007F} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
 		{44A1823B-EA31-4BAF-B264-0471C149D703} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
 		{62A9E0A6-2B00-4E44-8058-3611AF55280C} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
@@ -258,5 +255,8 @@ Global
 		{1CFB6D97-C430-4E27-85B6-A741AB9CDBBA} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
 		{D167CAD1-2E8B-40FF-A953-96008004BB76} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
 		{B48DFBE0-C3D0-4FE7-9F9F-1663FBFC7482} = {E53B3662-A5FD-4D4C-AFF6-1DC9FF24EA16}
+		{82B0FE94-1339-42C8-953F-E400CF9F1FF2} = {A89FC45A-A907-4487-8719-114530A62684}
+		{9B9BF25E-0ECD-4923-9546-4FDAEF685092} = {A89FC45A-A907-4487-8719-114530A62684}
+		{E1897235-0E04-420D-B6D5-29BEA14DA1FD} = {A89FC45A-A907-4487-8719-114530A62684}
 	EndGlobalSection
 EndGlobal

Fork.Net/Oreo.Plugins/Oreo.CleverDog/FodyWeavers.xml

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

Fork.Net/Oreo.Plugins/Oreo.CleverDog/Oreo.CleverDog.csproj

@@ -39,6 +39,10 @@
     <ApplicationIcon>Images\Icons\CleverDog.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura">
+      <HintPath>..\..\packages\Costura.Fody.1.6.2\lib\portable-net+sl+win+wpa+wp\Costura.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -110,13 +114,15 @@
     <Content Include="Images\Icons\CleverDog.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.2.0.9\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.2.0.9\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.2.0.9\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.9\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets')" />
+  <Import Project="..\..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Fork.Net/Oreo.Plugins/Oreo.CleverDog/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
-  <package id="Fody" version="2.0.9" targetFramework="net40" developmentDependency="true" />
+  <package id="Costura.Fody" version="1.6.2" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="2.1.0" targetFramework="net40" developmentDependency="true" />
 </packages>

Fork.Net/Y.Test/Y.Test.csproj

@@ -144,11 +144,11 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Y.Skin\Y.Skin.csproj">
+    <ProjectReference Include="..\..\Y.Skin\Y.Skin.csproj">
       <Project>{E9A97673-3E27-4A49-90BC-8806411A2F57}</Project>
       <Name>Y.Skin</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Y.Utils\Y.Utils.csproj">
+    <ProjectReference Include="..\..\Y.Utils\Y.Utils.csproj">
       <Project>{5b8eeec7-aeb5-407d-9dc1-1c59e53f78d5}</Project>
       <Name>Y.Utils</Name>
     </ProjectReference>

Fork.Net/Y.Utils/NetUtils/HttpUtils/HttpTool.cs

@@ -203,6 +203,7 @@ namespace Y.Utils.NetUtils.HttpUtils
         /// </summary>
         /// <param name="url">下载文件地址</param>
         /// <param name="file">文件存放地址，包含文件名</param>
+        /// <param name="progress">回调进度</param>
         /// <returns></returns>
         public static bool Download(string url, string file, ProgressDelegate.ProgressHandler progress = null)
         {
@@ -226,10 +227,12 @@ namespace Y.Utils.NetUtils.HttpUtils
                 //Stream stream = new FileStream(tempFile, FileMode.Create);
                 byte[] buffer = new byte[100 * 1024];
                 int readCount = 0;
+                long filesize = response.ContentLength, current = 0;
                 while ((readCount = responseStream.Read(buffer, 0, buffer.Length)) > 0)
                 {
                     fs.Write(buffer, 0, readCount);
-                    //progress?.Invoke(responseStream.Position, responseStream.Length);
+                    current += readCount;
+                    progress?.Invoke(current, filesize);
                 }
                 //stream.Close();
                 fs.Close();

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

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

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

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+$item = $project.ProjectItems | where-object {$_.Name -eq "FodyWeavers.xml"} 
+$item.Properties.Item("BuildAction").Value = [int]0