Skip to content

Commit

Permalink
Merge pull request JeffreySu#1727 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
Developer
  • Loading branch information
JeffreySu authored Apr 30, 2019
2 parents a541956 + 0005c9f commit 0ce2e3f
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 68 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.6.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.0-preview3\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0.1-preview3\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview3\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.5-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.6-preview3\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.6.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.5-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.0-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0.1-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.6-preview3" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.6.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.0-preview3\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0.1-preview3\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview3\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.5-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.6-preview3\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<package id="Moq" version="4.10.1" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.6.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.5-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.0-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0.1-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.6-preview3" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,26 @@
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.6.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.0-preview3\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.0.1-preview3\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Memcached, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Memcached.3.3.0-preview1\lib\net45\Senparc.CO2NET.Cache.Memcached.dll</HintPath>
<HintPath>..\packages\Senparc.CO2NET.Cache.Memcached.3.3.0-preview3\lib\net45\Senparc.CO2NET.Cache.Memcached.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis, Version=3.5.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.3.5.0.2-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.0-preview3\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.5-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.6-preview3\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar.App, Version=0.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.3.5-preview1\lib\net45\Senparc.NeuChar.App.dll</HintPath>
<Reference Include="Senparc.NeuChar.App, Version=0.3.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.3.6-preview3\lib\net45\Senparc.NeuChar.App.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.6.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Memcached" version="3.3.0-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.0-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.0.1-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Memcached" version="3.3.0-preview3" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.5.0.2-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.5-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.3.5-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.0-preview3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.6-preview3" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.3.6-preview3" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.Cache.Memcached">
<Version>3.3.0-preview1</Version>
<Version>3.3.0-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET">
<Version>0.6.1-preview1</Version>
<Version>0.7.0-preview3</Version>
</PackageReference>
<PackageReference Include="Senparc.CO2NET.APM">
<Version>0.3.0-preview1</Version>
<Version>0.3.0.1-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.APM">
<Version>0.3.0-preview1</Version>
<Version>0.3.0.1-preview3</Version>
</PackageReference>
<PackageReference Include="Senparc.NeuChar">
<Version>0.6.5-preview1</Version>
<Version>0.6.6-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<Version>4.10.1</Version>
</PackageReference>
<PackageReference Include="Senparc.NeuChar">
<Version>0.6.5-preview1</Version>
<Version>0.6.6-preview3</Version>
</PackageReference>
</ItemGroup>
<Choose>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar">
<Version>0.6.5-preview1</Version>
<Version>0.6.6-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET">
<Version>0.6.1-preview1</Version>
<Version>0.7.0-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar">
<Version>0.6.5-preview1</Version>
<Version>0.6.6-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,6 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.5.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.5.2\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis, Version=3.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.3.4.2\lib\net45\Senparc.CO2NET.Cache.Redis.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.1.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -101,18 +92,10 @@
<Project>{6313dc35-40ab-4b24-81bb-2f742e2e915e}</Project>
<Name>Senparc.Weixin.MP.Test</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.csproj">
<Project>{1d815fbf-451c-4e23-939c-cb80172f445c}</Project>
<Name>Senparc.Weixin.MP</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Senparc.Weixin.MP\Senparc.WeixinTests\Senparc.WeixinTests.csproj">
<Project>{232a67f2-cd89-4a20-8da9-daed76412b33}</Project>
<Name>Senparc.WeixinTests</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.csproj">
<Project>{814092cd-9cd0-4fb7-91e8-d147f476f1fb}</Project>
<Name>Senparc.Weixin</Name>
</ProjectReference>
<ProjectReference Include="..\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen.csproj">
<Project>{379D8C97-4F96-45AF-9F91-6BD160514495}</Project>
<Name>Senparc.Weixin.WxOpen</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET">
<Version>0.6.1-preview1</Version>
<Version>0.7.0-preview3</Version>
</PackageReference>
<PackageReference Include="Senparc.NeuChar">
<Version>0.6.5-preview1</Version>
<Version>0.6.6-preview3</Version>
</PackageReference>
<PackageReference Include="Senparc.Weixin">
<Version>6.4.0.1-preview1</Version>
<Version>6.4.1.2-preview3</Version>
</PackageReference>
<PackageReference Include="Senparc.Weixin.MP">
<Version>16.7.0.1-preview1</Version>
<Version>16.7.1.2-preview3</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down

0 comments on commit 0ce2e3f

Please sign in to comment.