Browse Source

mxg:修改程序集名称

mengxiangge 5 years ago
parent
commit
4439a34a36

+ 1 - 0
.gitignore

@@ -260,3 +260,4 @@ paket-files/
 __pycache__/
 __pycache__/
 *.pyc
 *.pyc
 /PackageUpdater/_Output
 /PackageUpdater/_Output
+/PackageUpdater/OutputDll

+ 1 - 1
PackageUpdater/PackageUpdater.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFUploadPackage", "WPFTestUpdate\WPFUploadPackage.csproj", "{B01D2D18-A517-42DB-A454-6F477BC9C592}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageUploader", "WPFTestUpdate\PackageUploader.csproj", "{B01D2D18-A517-42DB-A454-6F477BC9C592}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update", "Update\Update.csproj", "{62A86C88-5741-4261-94A1-254BC86331D4}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update", "Update\Update.csproj", "{62A86C88-5741-4261-94A1-254BC86331D4}"
 EndProject
 EndProject

+ 2 - 2
PackageUpdater/WPFTestUpdate/App.xaml

@@ -1,7 +1,7 @@
-<Application x:Class="WPFTestUpdate.App"
+<Application x:Class="PackageUploader.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:WPFTestUpdate"
+             xmlns:local="clr-namespace:PackageUploader"
              StartupUri="MainWindow.xaml">
              StartupUri="MainWindow.xaml">
     <Application.Resources>
     <Application.Resources>
          
          

+ 1 - 1
PackageUpdater/WPFTestUpdate/App.xaml.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows;
 
 
-namespace WPFTestUpdate
+namespace PackageUploader
 {
 {
     /// <summary>
     /// <summary>
     /// App.xaml 的交互逻辑
     /// App.xaml 的交互逻辑

+ 1 - 1
PackageUpdater/WPFTestUpdate/Compress/CompressArgs.cs

@@ -12,7 +12,7 @@
 
 
 using System;
 using System;
 
 
-namespace WPFTestUpdate.Compress
+namespace PackageUploader.Compress
 {
 {
     /// <summary>
     /// <summary>
     /// CompressArgs
     /// CompressArgs

+ 1 - 1
PackageUpdater/WPFTestUpdate/Compress/CompressT.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using ICSharpCode.SharpZipLib.Zip;
 using ICSharpCode.SharpZipLib.Zip;
 
 
-namespace WPFTestUpdate.Compress
+namespace PackageUploader.Compress
 {
 {
     /// <summary>
     /// <summary>
     /// Compress
     /// Compress

+ 1 - 1
PackageUpdater/WPFTestUpdate/Const.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace WPFTestUpdate
+namespace PackageUploader
 {
 {
     /// <summary>
     /// <summary>
     /// Const
     /// Const

+ 1 - 1
PackageUpdater/WPFTestUpdate/Extend.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace WPFTestUpdate
+namespace PackageUploader
 {
 {
     /// <summary>
     /// <summary>
     /// VisionExtend
     /// VisionExtend

+ 2 - 2
PackageUpdater/WPFTestUpdate/MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="WPFTestUpdate.MainWindow"
+<Window x:Class="PackageUploader.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -19,7 +19,7 @@
         </Grid.RowDefinitions>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0">
         <StackPanel Grid.Row="0">
             <dotuntils:SelectPath_Start Name="txtBasePath" Height="25" Text="{Binding Path=BasePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
             <dotuntils:SelectPath_Start Name="txtBasePath" Height="25" Text="{Binding Path=BasePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                        BtnImage="/WPFTestUpdate;Component/Image/folder.png"></dotuntils:SelectPath_Start>
+                                        BtnImage="/PackageUploader;Component/Image/folder.png"></dotuntils:SelectPath_Start>
             <Grid Height="25">
             <Grid Height="25">
                 <Grid.ColumnDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="25"/>
                     <ColumnDefinition Width="25"/>

+ 4 - 3
PackageUpdater/WPFTestUpdate/MainWindow.xaml.cs

@@ -1,5 +1,4 @@
-using SAGA.DotNetUtils.Extend;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.IO;
 using System.IO;
@@ -8,9 +7,11 @@ using System.Threading;
 using System.Windows;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls;
 using System.Windows.Threading;
 using System.Windows.Threading;
+using SAGA.DotNetUtils.Extend;
+using WPFTestUpdate;
 using WPFTestUpdate.Utils;
 using WPFTestUpdate.Utils;
 
 
-namespace WPFTestUpdate
+namespace PackageUploader
 {
 {
     /// <summary>
     /// <summary>
     /// MainWindow.xaml 的交互逻辑
     /// MainWindow.xaml 的交互逻辑

+ 8 - 2
PackageUpdater/WPFTestUpdate/WPFUploadPackage.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B01D2D18-A517-42DB-A454-6F477BC9C592}</ProjectGuid>
     <ProjectGuid>{B01D2D18-A517-42DB-A454-6F477BC9C592}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>WPFTestUpdate</RootNamespace>
-    <AssemblyName>WPFTestUpdate</AssemblyName>
+    <RootNamespace>PackageUploader</RootNamespace>
+    <AssemblyName>PackageUploader</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -33,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>YouTubeIcon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <Reference Include="Aliyun.OSS, Version=2.9.0.0, Culture=neutral, PublicKeyToken=0ad4175f0dac0b9b, processorArchitecture=MSIL">
     <Reference Include="Aliyun.OSS, Version=2.9.0.0, Culture=neutral, PublicKeyToken=0ad4175f0dac0b9b, processorArchitecture=MSIL">
       <HintPath>..\packages\Aliyun.OSS.SDK.2.9.0\lib\Aliyun.OSS.dll</HintPath>
       <HintPath>..\packages\Aliyun.OSS.SDK.2.9.0\lib\Aliyun.OSS.dll</HintPath>
@@ -130,5 +133,8 @@
       <Name>Update</Name>
       <Name>Update</Name>
     </ProjectReference>
     </ProjectReference>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="YouTubeIcon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
 </Project>

+ 2 - 0
PackageUpdater/WPFTestUpdate/PackageUploader.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Experimental</s:String></wpf:ResourceDictionary>

+ 2 - 2
PackageUpdater/WPFTestUpdate/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@ using System.Windows;
 // 有关程序集的一般信息由以下
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("WPFTestUpdate")]
+[assembly: AssemblyTitle("PackageUploader")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WPFTestUpdate")]
+[assembly: AssemblyProduct("PackageUploader")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

+ 2 - 2
PackageUpdater/WPFTestUpdate/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
-namespace WPFTestUpdate.Properties {
+namespace PackageUploader.Properties {
     using System;
     using System;
     
     
     
     
@@ -39,7 +39,7 @@ namespace WPFTestUpdate.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFTestUpdate.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PackageUploader.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                     resourceMan = temp;
                 }
                 }
                 return resourceMan;
                 return resourceMan;

+ 13 - 17
PackageUpdater/WPFTestUpdate/Properties/Settings.Designer.cs

@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
-namespace WPFTestUpdate.Properties
-{
-
-
+namespace PackageUploader.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
                 return defaultInstance;
             }
             }
         }
         }

+ 1 - 1
PackageUpdater/WPFTestUpdate/Readme.txt

@@ -1,4 +1,4 @@
 上传安装包
 上传安装包
 1,Release RR17 模式生成项目
 1,Release RR17 模式生成项目
-2,启动WPFTestUpdate,点上传安装包,进行上传
+2,启动PackageUploader,点上传安装包,进行上传
 3,启动上帝之手,会自动更新
 3,启动上帝之手,会自动更新

+ 5 - 10
PackageUpdater/WPFTestUpdate/Untility.cs

@@ -3,26 +3,21 @@
  * 创 建 者:Garrett
  * 创 建 者:Garrett
  * 创建日期:2019/1/29 11:19:14
  * 创建日期:2019/1/29 11:19:14
  * ==============================================================================*/
  * ==============================================================================*/
+
 using System;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.IO;
 using System.Linq;
 using System.Linq;
 using System.Reflection;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using SAGA.DotNetUtils.Encrypt;
-using ICSharpCode.SharpZipLib.Zip;
-using SAGA.DotNetUtils.Extend;
-using SAGA.DotNetUtils.FileOperate;
 using Aliyun.OSS;
 using Aliyun.OSS;
 using Aliyun.OSS.Common;
 using Aliyun.OSS.Common;
+using ICSharpCode.SharpZipLib.Zip;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Linq;
+using SAGA.DotNetUtils.FileOperate;
 using SAGA.DotNetUtils.Http;
 using SAGA.DotNetUtils.Http;
 using Update.Core.Entities;
 using Update.Core.Entities;
-using WPFTestUpdate.Compress;
+using PackageUploader.Compress;
 
 
-namespace WPFTestUpdate
+namespace PackageUploader
 {
 {
     /// <summary>
     /// <summary>
     /// Untility
     /// Untility

BIN
PackageUpdater/WPFTestUpdate/YouTubeIcon.ico