Permalink
Browse files

dll update

  • Loading branch information...
1 parent 8059254 commit dda108f5539d783a738c59bdf6476598a09931b9 @neuecc committed Dec 26, 2016
@@ -51,12 +51,12 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="ZeroFormatter, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.1.5.6\lib\net45\ZeroFormatter.dll</HintPath>
+ <Reference Include="ZeroFormatter, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.1.5.7\lib\net45\ZeroFormatter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.6\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.7\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -3,6 +3,6 @@
<package id="Grpc" version="1.0.1" targetFramework="net461" />
<package id="Grpc.Core" version="1.0.1" targetFramework="net461" />
<package id="System.Interactive.Async" version="3.0.0" targetFramework="net461" />
- <package id="ZeroFormatter" version="1.5.6" targetFramework="net461" />
- <package id="ZeroFormatter.Interfaces" version="1.5.6" targetFramework="net461" />
+ <package id="ZeroFormatter" version="1.5.7" targetFramework="net461" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net461" />
</packages>
@@ -243,12 +243,12 @@
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.1.5.6\lib\net45\ZeroFormatter.dll</HintPath>
+ <Reference Include="ZeroFormatter, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.1.5.7\lib\net45\ZeroFormatter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.6\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.7\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -81,6 +81,6 @@
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
- <package id="ZeroFormatter" version="1.5.6" targetFramework="net461" />
- <package id="ZeroFormatter.Interfaces" version="1.5.6" targetFramework="net461" />
+ <package id="ZeroFormatter" version="1.5.7" targetFramework="net461" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net461" />
</packages>
@@ -32,8 +32,8 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.5.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.5\lib\net35\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.7\lib\net35\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -49,7 +49,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.5\tools\zfc.exe -i $(ProjectPath) -o $(SolutionDir)src\MagicOnion.Client.Unity\Assets\Scripts\ZeroFormatterGenerated.cs -u</PreBuildEvent>
+ <PreBuildEvent>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.7\tools\zfc.exe -i $(ProjectPath) -o $(SolutionDir)src\MagicOnion.Client.Unity\Assets\Scripts\ZeroFormatterGenerated.cs -u</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ZeroFormatter.Analyzer" version="1.1.1" targetFramework="net35" />
- <package id="ZeroFormatter.Interfaces" version="1.5.5" targetFramework="net35" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net35" />
</packages>
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 450c4a42f6e98554baf78bd97178680b
-timeCreated: 1482740901
+timeCreated: 1482747574
licenseType: Pro
DefaultImporter:
userData:
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: d447e7848cf19a5478ab56a766150b4f
-timeCreated: 1481803308
+guid: 124a67ef78c51cb44843ed402aee5c00
+timeCreated: 1482747574
licenseType: Pro
PluginImporter:
serializedVersion: 1
@@ -11,70 +11,11 @@
namespace MagicOnion.Tests
{
- public static class UnitySystemConsoleRedirector
- {
- private class UnityTextWriter : TextWriter
- {
- private StringBuilder buffer = new StringBuilder();
-
- public override void Flush()
- {
- Debug.Log(buffer.ToString());
- buffer.Length = 0;
- }
-
- public override void Write(string value)
- {
- buffer.Append(value);
- if (value != null)
- {
- var len = value.Length;
- if (len > 0)
- {
- var lastChar = value[len - 1];
- if (lastChar == '\n')
- {
- Flush();
- }
- }
- }
- }
-
- public override void Write(char value)
- {
- buffer.Append(value);
- if (value == '\n')
- {
- Flush();
- }
- }
-
- public override void Write(char[] value, int index, int count)
- {
- Write(new string(value, index, count));
- }
-
- public override Encoding Encoding
- {
- get { return Encoding.Default; }
- }
- }
-
- public static void Redirect()
- {
- Console.SetOut(new UnityTextWriter());
- Console.SetError(new UnityTextWriter());
- }
- }
-
-
public static class UnitTestLoader
{
[UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.BeforeSceneLoad)]
public static void Register()
{
- UnitySystemConsoleRedirector.Redirect();
-
// Register First
ZeroFormatterInitializer.Register();
MagicOnionInitializer.Register();
@@ -83,7 +24,7 @@ public static void Register()
// gRPC Config
Environment.SetEnvironmentVariable("GRPC_VERBOSITY", "DEBUG");
Environment.SetEnvironmentVariable("GRPC_TRACE", "all");
- Grpc.Core.GrpcEnvironment.SetLogger(new Grpc.Core.Logging.ConsoleLogger());
+ Grpc.Core.GrpcEnvironment.SetLogger(new MagicOnion.UnityDebugLogger());
UnitTest.RegisterAllMethods<SimpleTest>();
UnitTest.RegisterAllMethods<StandardTest>();
@@ -15,15 +15,9 @@ public class SimpleTest
{
IMyFirstService GetClient()
{
-
- Environment.SetEnvironmentVariable("GRPC_VERBOSITY", "DEBUG");
- Environment.SetEnvironmentVariable("GRPC_TRACE", "all");
-
var channel = new Channel("localhost", 12345, ChannelCredentials.Insecure);
var client = MagicOnionClient.Create<IMyFirstService>(channel);
- Environment.SetEnvironmentVariable("GRPC_VERBOSITY", "DEBUG");
- Environment.SetEnvironmentVariable("GRPC_TRACE", "all");
return client;
}
@@ -64,15 +64,15 @@
<Reference Include="SharedLibrary">
<HintPath>Assets\Plugins\SharedLibrary.dll</HintPath>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces">
- <HintPath>Assets\Plugins\ZeroFormatter.Interfaces.dll</HintPath>
- </Reference>
<Reference Include="ZeroFormatter">
<HintPath>Assets\Plugins\ZeroFormatter\ZeroFormatter.dll</HintPath>
</Reference>
<Reference Include="ZeroFormatter.Interfaces">
<HintPath>Assets\Plugins\ZeroFormatter\ZeroFormatter.Interfaces.dll</HintPath>
</Reference>
+ <Reference Include="ZeroFormatter.Interfaces">
+ <HintPath>Assets\Plugins\ZeroFormatter.Interfaces.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Plugins\UniRx\Scripts\Asynchronous\WebRequestExtensions.cs" />
@@ -64,15 +64,15 @@
<Reference Include="SharedLibrary">
<HintPath>Assets\Plugins\SharedLibrary.dll</HintPath>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces">
- <HintPath>Assets\Plugins\ZeroFormatter.Interfaces.dll</HintPath>
- </Reference>
<Reference Include="ZeroFormatter">
<HintPath>Assets\Plugins\ZeroFormatter\ZeroFormatter.dll</HintPath>
</Reference>
<Reference Include="ZeroFormatter.Interfaces">
<HintPath>Assets\Plugins\ZeroFormatter\ZeroFormatter.Interfaces.dll</HintPath>
</Reference>
+ <Reference Include="ZeroFormatter.Interfaces">
+ <HintPath>Assets\Plugins\ZeroFormatter.Interfaces.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="MagicOnion.Client.Unity.CSharp.Plugins.csproj">
@@ -147,12 +147,12 @@
<HintPath>$(SolutionDir)packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>$(SolutionDir)packages\ZeroFormatter.1.5.6\lib\net45\ZeroFormatter.dll</HintPath>
+ <Reference Include="ZeroFormatter, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\ZeroFormatter.1.5.7\lib\net45\ZeroFormatter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.6\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.7\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -234,7 +234,7 @@
<EmbeddedResource Include="Swagger\SwaggerUI\lib\sanitize-html.min.js" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets" Condition="Exists('$(SolutionDir)packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets')" />
+ <Import Project="$(SolutionDir)packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets" Condition="Exists('$(SolutionDir)packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.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>
@@ -55,6 +55,6 @@
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
- <package id="ZeroFormatter" version="1.5.6" targetFramework="net461" />
- <package id="ZeroFormatter.Interfaces" version="1.5.6" targetFramework="net461" />
+ <package id="ZeroFormatter" version="1.5.7" targetFramework="net461" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net461" />
</packages>
@@ -47,12 +47,12 @@
<HintPath>$(SolutionDir)packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>$(SolutionDir)packages\ZeroFormatter.1.5.6\lib\net45\ZeroFormatter.dll</HintPath>
+ <Reference Include="ZeroFormatter, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\ZeroFormatter.1.5.7\lib\net45\ZeroFormatter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.6\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\ZeroFormatter.Interfaces.1.5.7\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -101,12 +101,12 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets" Condition="Exists('$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets')" />
+ <Import Project="$(SolutionDir)packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets" Condition="Exists('$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.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('$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets'))" />
+ <Error Condition="!Exists('$(SolutionDir)packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Grpc.Core.1.0.1\build\net45\Grpc.Core.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -3,6 +3,6 @@
<package id="Grpc" version="1.0.1" targetFramework="net461" />
<package id="Grpc.Core" version="1.0.1" targetFramework="net461" />
<package id="System.Interactive.Async" version="3.0.0" targetFramework="net461" />
- <package id="ZeroFormatter" version="1.5.6" targetFramework="net461" />
- <package id="ZeroFormatter.Interfaces" version="1.5.6" targetFramework="net461" />
+ <package id="ZeroFormatter" version="1.5.7" targetFramework="net461" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net461" />
</packages>
@@ -65,12 +65,12 @@
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.1.5.6\lib\net45\ZeroFormatter.dll</HintPath>
+ <Reference Include="ZeroFormatter, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.1.5.7\lib\net45\ZeroFormatter.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="ZeroFormatter.Interfaces, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.6\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
+ <Reference Include="ZeroFormatter.Interfaces, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ZeroFormatter.Interfaces.1.5.7\lib\net45\ZeroFormatter.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -11,6 +11,6 @@
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net461" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net461" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net461" />
- <package id="ZeroFormatter" version="1.5.6" targetFramework="net461" />
- <package id="ZeroFormatter.Interfaces" version="1.5.6" targetFramework="net461" />
+ <package id="ZeroFormatter" version="1.5.7" targetFramework="net461" />
+ <package id="ZeroFormatter.Interfaces" version="1.5.7" targetFramework="net461" />
</packages>

0 comments on commit dda108f

Please sign in to comment.