v1.1.0

Author: zmjack

PortProxyGUI - NET35/PortProxyGUI.cs

@@ -1,4 +1,4 @@
-using PortProxyGUI._extern.NStandard;
+using NStandard;
 using System;
 using System.Data;
 using System.Linq;

PortProxyGUI - NET35/SetProxyForm.cs

@@ -1,4 +1,4 @@
-using PortProxyGUI._extern.NStandard;
+using NStandard;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;

PortProxyGUI - NET45/PortProxyGUI - NET45.csproj

@@ -12,6 +12,9 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,9 +30,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -174,11 +174,11 @@
   </ItemGroup>
   <Import Project="..\PortProxyGUI.Shared\PortProxyGUI.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
-  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
 </Project>

PortProxyGUI - NET45/PortProxyGUI.cs

@@ -1,4 +1,4 @@
-using PortProxyGUI._extern.NStandard;
+using NStandard;
 using System;
 using System.Data;
 using System.Linq;

PortProxyGUI - NET45/SetProxyForm.cs

@@ -1,4 +1,4 @@
-using PortProxyGUI._extern.NStandard;
+using NStandard;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;

PortProxyGUI - NET45/app.config

@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-  <entityFramework>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
-    </providers>
-  </entityFramework>
-  
+  </startup>  
 </configuration>

PortProxyGUI.Shared/CmdUtil.cs

@@ -1,4 +1,4 @@
-using PortProxyGUI._extern.NStandard;
+using NStandard;
 using PortProxyGUI.Data;
 using System;
 using System.Linq;
@@ -22,7 +22,7 @@ public static Rule[] GetProxies()
             var proxies = types.SelectMany(type =>
             {
                 var typeProxies = output
-                    .Project(new Regex($@"{type.From}:[^\n]+?{type.To}:\r\n\r\n.+?\r\n--------------- ----------  --------------- ----------\r\n(.+?)\r\n\r\n", RegexOptions.Singleline))
+                    .ExtractFirst(new Regex($@"{type.From}:[^\n]+?{type.To}:\r\n\r\n.+?\r\n--------------- ----------  --------------- ----------\r\n(.+?)\r\n\r\n", RegexOptions.Singleline))
                     ?.Split(new[] { Environment.NewLine }, StringSplitOptions.None)
                     .Select(line =>
                     {

PortProxyGUI.Shared/PortProxyGUI.Shared.projitems

@@ -18,7 +18,5 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Rule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ListViewColumnSorter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ProxyType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)~extern\NStandard\XString.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)~extern\NStandard\XObject.cs" />
   </ItemGroup>
 </Project>