From b7ac15ad550076682b661c16f116f38dcb038775 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 18 Aug 2022 17:11:36 +0800
Subject: [PATCH] fix
---
.gitignore | 4 ++--
v2rayN/v2rayN/v2rayN.csproj | 29 ++++++++++++++++++++++---
v2rayN/v2rayUpgrade/v2rayUpgrade.csproj | 1 +
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index afeea2ed..42698ddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,6 @@
.vs/slnx.sqlite
.vs/VSWorkspaceState.json
/v2rayN/v2rayUpgrade/bin/Debug
-/v2rayN/v2rayUpgrade/obj/Debug
/v2rayN/v2rayUpgrade/bin/Release
-/v2rayN/v2rayUpgrade/obj/Release
\ No newline at end of file
+/v2rayN/v2rayUpgrade/obj/
+*.user
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index adc62a6e..0fabb76b 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,6 +10,30 @@
<PropertyGroup>
<ApplicationIcon>v2rayN.ico</ApplicationIcon>
</PropertyGroup>
+ <ItemGroup>
+ <None Remove="Sample\custom_routing_black" />
+ <None Remove="Sample\custom_routing_global" />
+ <None Remove="Sample\custom_routing_locked" />
+ <None Remove="Sample\custom_routing_rules" />
+ <None Remove="Sample\custom_routing_white" />
+ <None Remove="Sample\SampleClientConfig.txt" />
+ <None Remove="Sample\SampleHttprequest.txt" />
+ <None Remove="Sample\SampleHttpresponse.txt" />
+ <None Remove="Sample\SampleInbound.txt" />
+ <None Remove="Sample\SampleServerConfig.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Sample\custom_routing_black" />
+ <EmbeddedResource Include="Sample\custom_routing_global" />
+ <EmbeddedResource Include="Sample\custom_routing_locked" />
+ <EmbeddedResource Include="Sample\custom_routing_rules" />
+ <EmbeddedResource Include="Sample\custom_routing_white" />
+ <EmbeddedResource Include="Sample\SampleClientConfig.txt" />
+ <EmbeddedResource Include="Sample\SampleHttprequest.txt" />
+ <EmbeddedResource Include="Sample\SampleHttpresponse.txt" />
+ <EmbeddedResource Include="Sample\SampleInbound.txt" />
+ <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
+ </ItemGroup>
<ItemGroup>
<Reference Include="System.Data.Linq" />
<Reference Include="System.IO.Compression" />
@@ -51,9 +75,8 @@
</PackageReference>
</ItemGroup>
<PropertyGroup>
- <PostBuildEvent>copy /y $(SolutionDir)v2rayUpgrade\$(OutDir)* $(TargetDir)
-
-del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib
+ <PostBuildEvent>del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib
if not "$(ConfigurationName)" == "Debug" del $(TargetDir)*.pdb</PostBuildEvent>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index d3a7d721..56a75ee9 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -6,6 +6,7 @@
<Copyright>Copyright © 2019-2020 (GPLv3)</Copyright>
<FileVersion>1.1.0.0</FileVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.IO.Compression" />