Update PCL files

ServiceStack · Aug 25, 2015 · e5b86fd · e5b86fd
1 parent 21abf9f
commit e5b86fd
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 25 deletions.
diff --git a/lib/pcl/ServiceStack.Client.dll b/lib/pcl/ServiceStack.Client.dll
diff --git a/lib/pcl/ServiceStack.Text.dll b/lib/pcl/ServiceStack.Text.dll
diff --git a/src/ServiceStack.Pcl.Android/PclExport.Net40.cs b/src/ServiceStack.Pcl.Android/PclExport.Net40.cs
@@ -1243,10 +1243,9 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, RSAP
                 return RSAalg.VerifySha1Data(DataToVerify, SignedData);
 
             }
-            catch (CryptographicException e)
+            catch (CryptographicException ex)
             {
-                Console.WriteLine(e.Message);
-
+                Tracer.Instance.WriteError(ex);
                 return false;
             }
         }

diff --git a/src/ServiceStack.Pcl.Android/Resources/Resource.Designer.cs b/src/ServiceStack.Pcl.Android/Resources/Resource.Designer.cs
diff --git a/src/ServiceStack.Pcl.Mac20/PclExport.Net40.cs b/src/ServiceStack.Pcl.Mac20/PclExport.Net40.cs
@@ -1243,10 +1243,9 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, RSAP
                 return RSAalg.VerifySha1Data(DataToVerify, SignedData);
 
             }
-            catch (CryptographicException e)
+            catch (CryptographicException ex)
             {
-                Console.WriteLine(e.Message);
-
+                Tracer.Instance.WriteError(ex);
                 return false;
             }
         }

diff --git a/src/ServiceStack.Pcl.Net45/PclExport.Net40.cs b/src/ServiceStack.Pcl.Net45/PclExport.Net40.cs
@@ -1243,10 +1243,9 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, RSAP
                 return RSAalg.VerifySha1Data(DataToVerify, SignedData);
 
             }
-            catch (CryptographicException e)
+            catch (CryptographicException ex)
             {
-                Console.WriteLine(e.Message);
-
+                Tracer.Instance.WriteError(ex);
                 return false;
             }
         }

diff --git a/src/ServiceStack.Pcl.WinStore/ServiceStack.Pcl.WinStore.csproj b/src/ServiceStack.Pcl.WinStore/ServiceStack.Pcl.WinStore.csproj
@@ -98,13 +98,6 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\..\..\ServiceStack\src\ServiceStack.Client\ServiceStack.Client.PCL.csproj">
-      <Project>{135808a7-ce69-4c32-be30-25a8ffbf4a58}</Project>
-      <Name>ServiceStack.Client.PCL</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\ServiceStack.Client\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
@@ -123,6 +116,12 @@
       <HintPath>..\..\lib\pcl\ServiceStack.Text.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.PCL.csproj">
+      <Project>{42e1c8c0-a163-44cc-92b1-8f416f2c0b01}</Project>
+      <Name>ServiceStack.Client.PCL</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/src/ServiceStack.Pcl.iOS/PclExport.Net40.cs b/src/ServiceStack.Pcl.iOS/PclExport.Net40.cs
@@ -1243,10 +1243,9 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, RSAP
                 return RSAalg.VerifySha1Data(DataToVerify, SignedData);
 
             }
-            catch (CryptographicException e)
+            catch (CryptographicException ex)
             {
-                Console.WriteLine(e.Message);
-
+                Tracer.Instance.WriteError(ex);
                 return false;
             }
         }

diff --git a/src/ServiceStack.Pcl.iOS10/PclExport.Net40.cs b/src/ServiceStack.Pcl.iOS10/PclExport.Net40.cs
@@ -1243,10 +1243,9 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, RSAP
                 return RSAalg.VerifySha1Data(DataToVerify, SignedData);
 
             }
-            catch (CryptographicException e)
+            catch (CryptographicException ex)
             {
-                Console.WriteLine(e.Message);
-
+                Tracer.Instance.WriteError(ex);
                 return false;
             }
         }

diff --git a/tests/PclTest.Android/Resources/Resource.Designer.cs b/tests/PclTest.Android/Resources/Resource.Designer.cs
diff --git a/tests/PclTest.WinStore/PclTest.WinStore.csproj b/tests/PclTest.WinStore/PclTest.WinStore.csproj
@@ -131,7 +131,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="PclTest.WinStore_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Logo.png" />