添加异常捕获

ElderJames · Dec 7, 2017 · 4868bac · 4868bac
1 parent 247a6de
commit 4868bac
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 325 deletions.
diff --git a/build/version.props b/build/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>preview-10020</VersionSuffix>
+    <VersionSuffix>preview-10025</VersionSuffix>
     <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>

diff --git a/src/Shriek.ServiceProxy.Abstractions/Shriek.ServiceProxy.Abstractions.csproj b/src/Shriek.ServiceProxy.Abstractions/Shriek.ServiceProxy.Abstractions.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspectCore.Abstractions" Version="0.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 

diff --git a/src/Shriek.ServiceProxy.Http/Shriek.ServiceProxy.Http.csproj b/src/Shriek.ServiceProxy.Http/Shriek.ServiceProxy.Http.csproj
@@ -6,11 +6,11 @@
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AspectCore.Core" Version="0.2.4" />
-    <PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="0.2.4" />
+    <PackageReference Include="AspectCore.Core" Version="0.2.0" />
+    <PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="0.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="2.0.0" />
   </ItemGroup>
 

diff --git a/src/Shriek.ServiceProxy.Tcp/Shriek.ServiceProxy.Tcp.csproj b/src/Shriek.ServiceProxy.Tcp/Shriek.ServiceProxy.Tcp.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="0.2.4" />
+    <PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="0.2.0" />
     <PackageReference Include="protobuf-net" Version="2.3.3" />
   </ItemGroup>
 

diff --git a/src/Shriek/AppDomainExtensions.cs b/src/Shriek/AppDomainExtensions.cs
@@ -36,9 +36,16 @@ public static IEnumerable<Assembly> GetExcutingAssemblies(this AppDomain @this)
 
         public static void UpdateExcutingAssemblies(this AppDomain @this)
         {
-            var assemblies = ReflectionUtil.GetAssemblies(new AssemblyFilter(@this.GetActualDomainPath()));
+            try
+            {
+                var assemblies = ReflectionUtil.GetAssemblies(new AssemblyFilter(@this.GetActualDomainPath()));
 
-            excutingAssembiles = @this.GetExcutingAssemblies().Union(assemblies).Union(new[] { Assembly.GetCallingAssembly(), Assembly.GetExecutingAssembly() }).Distinct();
+                excutingAssembiles = @this.GetExcutingAssemblies().Union(assemblies)
+                    .Union(new[] { Assembly.GetCallingAssembly(), Assembly.GetExecutingAssembly() }).Distinct();
+            }
+            catch
+            {
+            }
         }
     }
 }
diff --git a/test/Shriek.Test/WebApiProxy/GetNotEncodingPlusTest.cs b/test/Shriek.Test/WebApiProxy/GetNotEncodingPlusTest.cs
diff --git a/test/Shriek.Test/WebApiProxy/GetPropertyTest.cs b/test/Shriek.Test/WebApiProxy/GetPropertyTest.cs
diff --git a/test/Shriek.Test/WebApiProxy/GetStringTest.cs b/test/Shriek.Test/WebApiProxy/GetStringTest.cs
diff --git a/test/Shriek.Test/WebApiProxy/PostWithUriAndBodyTest.cs b/test/Shriek.Test/WebApiProxy/PostWithUriAndBodyTest.cs