-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge from CrescentFresh-no-strong-name
- Loading branch information
Jon Menzies-Smith
committed
Dec 8, 2015
1 parent
7a6cf54
commit 46b98fa
Showing
35 changed files
with
829 additions
and
823 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| nuget pack ../src/TagCache.Redis/TagCache.Redis.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget | ||
|
|
||
| nuget pack ../src/TagCache.Redis.Json.Net/TagCache.Redis.Json.Net.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.Json.Net | ||
|
|
||
| nuget pack ../src/TagCache.Redis.ProtoBuf/TagCache.Redis.ProtoBuf.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.ProtoBuf | ||
|
|
||
| nuget pack ../src/TagCache.Redis.FastJson/TagCache.Redis.FastJson.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.FastJson | ||
|
|
||
| nuget pack ../src/TagCache.Redis.Migrant/TagCache.Redis.Migrant.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.Migrant | ||
|
|
||
| nuget pack ../src/TagCache.Redis.MessagePack/TagCache.Redis.MessagePack.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.MessagePack | ||
|
|
||
| nuget pack ../src/TagCache.Redis/TagCache.Redis.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget | ||
|
|
||
| nuget pack ../src/TagCache.Redis.Json.Net/TagCache.Redis.Json.Net.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.Json.Net | ||
|
|
||
| nuget pack ../src/TagCache.Redis.ProtoBuf/TagCache.Redis.ProtoBuf.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.ProtoBuf | ||
|
|
||
| nuget pack ../src/TagCache.Redis.FastJson/TagCache.Redis.FastJson.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.FastJson | ||
|
|
||
| nuget pack ../src/TagCache.Redis.Migrant/TagCache.Redis.Migrant.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.Migrant | ||
|
|
||
| nuget pack ../src/TagCache.Redis.MessagePack/TagCache.Redis.MessagePack.csproj -Build -Symbols -Properties Configuration=Release -OutputDirectory nuget/TagCache.Redis.MessagePack | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 17 additions & 17 deletions
34
src/TagCache.Redis.FastJson/FastJsonSerializationProvider.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| using StackExchange.Redis; | ||
| using TagCache.Redis.Interfaces; | ||
|
|
||
| namespace TagCache.Redis.FastJson | ||
| { | ||
| public class FastJsonSerializationProvider : ISerializationProvider | ||
| { | ||
| public T Deserialize<T>(RedisValue value) where T : class | ||
| { | ||
| return fastJSON.JSON.ToObject<T>(value); | ||
| } | ||
|
|
||
| public RedisValue Serialize<T>(T value) where T : class | ||
| { | ||
| return fastJSON.JSON.ToJSON(value); | ||
| } | ||
| } | ||
| using StackExchange.Redis; | ||
| using TagCache.Redis.Interfaces; | ||
|
|
||
| namespace TagCache.Redis.FastJson | ||
| { | ||
| public class FastJsonSerializationProvider : ISerializationProvider | ||
| { | ||
| public T Deserialize<T>(RedisValue value) where T : class | ||
| { | ||
| return fastJSON.JSON.ToObject<T>(value); | ||
| } | ||
|
|
||
| public RedisValue Serialize<T>(T value) where T : class | ||
| { | ||
| return fastJSON.JSON.ToJSON(value); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using System.Reflection; | ||
| [assembly: AssemblyTitle("TagCache.Redis.FastJson")] | ||
| [assembly: AssemblyDescription("FastJSON serialization for TagCache.Redis")] | ||
| [assembly: AssemblyProduct("TagCache.Redis.FastJson")] | ||
| using System.Reflection; | ||
| [assembly: AssemblyTitle("TagCache.Redis.FastJson")] | ||
| [assembly: AssemblyDescription("FastJSON serialization for TagCache.Redis")] | ||
| [assembly: AssemblyProduct("TagCache.Redis.FastJson")] |
148 changes: 74 additions & 74 deletions
148
src/TagCache.Redis.FastJson/TagCache.Redis.FastJson.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,75 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{0089EEE8-9DFD-41C0-9128-70BEE1C253D8}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>TagCache.Redis.FastJson</RootNamespace> | ||
| <AssemblyName>TagCache.Redis.FastJson</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="fastjson, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL"> | ||
| <SpecificVersion>False</SpecificVersion> | ||
| <HintPath>..\packages\fastJSON.2.1.9.0\lib\net40\fastjson.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\StackExchange.Redis.1.0.394\lib\net45\StackExchange.Redis.dll</HintPath> | ||
| <Private>True</Private> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="..\TagCache.Redis\Properties\AssemblyInfo.Shared.cs"> | ||
| <Link>Properties\AssemblyInfo.Shared.cs</Link> | ||
| </Compile> | ||
| <Compile Include="CacheConfiguration.cs" /> | ||
| <Compile Include="FastJsonSerializationProvider.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| <None Include="TagCache.Redis.FastJson.nuspec" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\TagCache.Redis\TagCache.Redis.csproj"> | ||
| <Project>{280f50ba-1633-4de0-8c6f-77f82290d214}</Project> | ||
| <Name>TagCache.Redis</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- 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. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{0089EEE8-9DFD-41C0-9128-70BEE1C253D8}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>TagCache.Redis.FastJson</RootNamespace> | ||
| <AssemblyName>TagCache.Redis.FastJson</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="fastjson, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL"> | ||
| <SpecificVersion>False</SpecificVersion> | ||
| <HintPath>..\packages\fastJSON.2.1.9.0\lib\net40\fastjson.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\StackExchange.Redis.1.0.394\lib\net45\StackExchange.Redis.dll</HintPath> | ||
| <Private>True</Private> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="..\TagCache.Redis\Properties\AssemblyInfo.Shared.cs"> | ||
| <Link>Properties\AssemblyInfo.Shared.cs</Link> | ||
| </Compile> | ||
| <Compile Include="CacheConfiguration.cs" /> | ||
| <Compile Include="FastJsonSerializationProvider.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| <None Include="TagCache.Redis.FastJson.nuspec" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\TagCache.Redis\TagCache.Redis.csproj"> | ||
| <Project>{280f50ba-1633-4de0-8c6f-77f82290d214}</Project> | ||
| <Name>TagCache.Redis</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- 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. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="fastJSON" version="2.1.9.0" targetFramework="net45" /> | ||
| <package id="StackExchange.Redis" version="1.0.394" targetFramework="net45" /> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="fastJSON" version="2.1.9.0" targetFramework="net45" /> | ||
| <package id="StackExchange.Redis" version="1.0.394" targetFramework="net45" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| using System.Reflection; | ||
| [assembly: AssemblyTitle("TagCache.Redis.Json.Net")] | ||
| [assembly: AssemblyDescription("JSON.NET serialization for TagCache.Redis")] | ||
| using System.Reflection; | ||
| [assembly: AssemblyTitle("TagCache.Redis.Json.Net")] | ||
| [assembly: AssemblyDescription("JSON.NET serialization for TagCache.Redis")] | ||
| [assembly: AssemblyProduct("TagCache.Redis.Json.Net")] |
Oops, something went wrong.