From dc7abb66b23ceab3c9ea7edaaddd39fb4cfa240e Mon Sep 17 00:00:00 2001
From: next-autumn <next-autumn@google.com>
Date: Wed, 26 May 2021 19:12:13 +0800
Subject: [PATCH] fix install cert issue

---
 ProxySuper.Core/Services/TrojanGoProject.cs       |  9 +++++----
 ProxySuper.Core/Services/XrayProject.cs           |  8 ++++----
 ProxySuper.WPF/ProxySuper.WPF.csproj              | 12 ++++++++----
 ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml |  1 +
 ProxySuper.WPF/Views/TrojanGoInstallerView.xaml   |  1 +
 ProxySuper.WPF/Views/XrayInstallerView.xaml       |  1 +
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ProxySuper.Core/Services/TrojanGoProject.cs b/ProxySuper.Core/Services/TrojanGoProject.cs
index 7570d05..4519f0d 100644
--- a/ProxySuper.Core/Services/TrojanGoProject.cs
+++ b/ProxySuper.Core/Services/TrojanGoProject.cs
@@ -105,15 +105,16 @@ namespace ProxySuper.Core.Services
                 ValidateDomain();
                 WriteOutput("域名检测完成");
 
-                WriteOutput("安装Trojan-Go...");
-                InstallTrojanGo();
-                WriteOutput("Trojan-Go安装完成");
-
                 WriteOutput("安装Caddy...");
                 InstallCaddy();
                 UploadCaddyFile();
                 WriteOutput("Caddy安装完成");
 
+                WriteOutput("安装Trojan-Go...");
+                InstallTrojanGo();
+                WriteOutput("Trojan-Go安装完成");
+
+
                 WriteOutput("启动BBR");
                 EnableBBR();
 
diff --git a/ProxySuper.Core/Services/XrayProject.cs b/ProxySuper.Core/Services/XrayProject.cs
index de8b3e4..4dd6043 100644
--- a/ProxySuper.Core/Services/XrayProject.cs
+++ b/ProxySuper.Core/Services/XrayProject.cs
@@ -78,14 +78,14 @@ namespace ProxySuper.Core.Services
                 ValidateDomain();
                 WriteOutput("域名检测完成");
 
-                WriteOutput("安装Xray-Core...");
-                InstallXrayWithCert();
-                WriteOutput("Xray-Core安装完成");
-
                 WriteOutput("安装Caddy...");
                 InstallCaddy();
                 WriteOutput("Caddy安装完成");
 
+                WriteOutput("安装Xray-Core...");
+                InstallXrayWithCert();
+                WriteOutput("Xray-Core安装完成");
+
                 WriteOutput("启动BBR");
                 EnableBBR();
 
diff --git a/ProxySuper.WPF/ProxySuper.WPF.csproj b/ProxySuper.WPF/ProxySuper.WPF.csproj
index de7f3a5..0bb39b3 100644
--- a/ProxySuper.WPF/ProxySuper.WPF.csproj
+++ b/ProxySuper.WPF/ProxySuper.WPF.csproj
@@ -2,6 +2,10 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+  　　<AllowedReferenceRelatedFileExtensions>
+　　　　<!-- 阻止默认的 XML 和 PDB 文件复制到 RELEASE 的输出目录. 只有*.allowedextension 扩展名的文件可以被包含, 当然这个扩展的文件并不存在.-->
+　　　　.allowedextension
+　　</AllowedReferenceRelatedFileExtensions>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B083EBFD-2925-46C9-8B00-E2C1300CEBA1}</ProjectGuid>
@@ -16,6 +20,8 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -28,18 +34,16 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml b/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml
index 5eff206..379e94d 100644
--- a/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxyInstallerView.xaml
@@ -22,6 +22,7 @@
                  BorderThickness="0"
                  VerticalAlignment="Top"
                  VerticalContentAlignment="Top"
+                 TextWrapping="WrapWithOverflow"
                  Text="{Binding Path=OutputText}"
         />
 
diff --git a/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml b/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml
index a2514eb..3dd9fc7 100644
--- a/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml
+++ b/ProxySuper.WPF/Views/TrojanGoInstallerView.xaml
@@ -22,6 +22,7 @@
                  BorderThickness="0"
                  VerticalAlignment="Top"
                  VerticalContentAlignment="Top"
+                 TextWrapping="WrapWithOverflow"
                  Text="{Binding Path=OutputText}"
         />
 
diff --git a/ProxySuper.WPF/Views/XrayInstallerView.xaml b/ProxySuper.WPF/Views/XrayInstallerView.xaml
index 1497edc..f0461dc 100644
--- a/ProxySuper.WPF/Views/XrayInstallerView.xaml
+++ b/ProxySuper.WPF/Views/XrayInstallerView.xaml
@@ -22,6 +22,7 @@
                  BorderThickness="0"
                  VerticalAlignment="Top"
                  VerticalContentAlignment="Top"
+                 TextWrapping="WrapWithOverflow"
                  Text="{Binding Path=OutputText}"
         />