Skip to content

Commit f1003b4

Browse files
mgravellmgravell
committed
2.0, the strong-namification begins
1 parent 12e49f6 commit f1003b4

File tree

11 files changed

+27
-66
lines changed

11 files changed

+27
-66
lines changed

‎Directory.build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>1.2.7</VersionPrefix>
4-
3+
<VersionPrefix>2.0.0</VersionPrefix>
54
<Copyright>2017 Stack Exchange, Inc.</Copyright>
65
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
76
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -23,7 +22,7 @@
2322
<IncludeSymbols>false</IncludeSymbols>
2423

2524
<LibraryTargetFrameworks>net45;net46;netstandard2.0</LibraryTargetFrameworks>
26-
<CoreFxVersion>4.3.0</CoreFxVersion>
25+
<CoreFxVersion>4.5.0</CoreFxVersion>
2726
<xUnitVersion>2.4.0-beta.2.build3981</xUnitVersion>
2827
</PropertyGroup>
2928
</Project>

‎NRediSearch/NRediSearch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
4-
<VersionPrefix>0.2</VersionPrefix>
54
<GenerateDocumentationFile>false</GenerateDocumentationFile>
65
<PackageTags>Redis;Search;Modules;RediSearch</PackageTags>
6+
<SignAssembly>true</SignAssembly>
77
</PropertyGroup>
88
<ItemGroup>
99
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />

‎StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎StackExchange.Redis.StrongName/build.cmd‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎StackExchange.Redis.Tests/Helpers/TestConfig.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.IO;
2-
using Jil;
32
using System;
43
using System.Collections.Generic;
4+
using Newtonsoft.Json;
55

66
namespace StackExchange.Redis.Tests
77
{
@@ -22,7 +22,7 @@ static TestConfig()
2222
{
2323
using (var reader = new StreamReader(stream))
2424
{
25-
Current = JSON.Deserialize<Config>(reader);
25+
Current = JsonConvert.DeserializeObject<Config>(reader.ReadToEnd());
2626
}
2727
}
2828
}

‎StackExchange.Redis.Tests/StackExchange.Redis.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<AssemblyName>StackExchange.Redis.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8+
<SignAssembly>true</SignAssembly>
89
<DebugType>full</DebugType>
910
</PropertyGroup>
1011

@@ -15,10 +16,10 @@
1516

1617
<ItemGroup>
1718
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />
18-
<PackageReference Include="Jil" Version="2.15.4" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
2020
<PackageReference Include="Moq" Version="4.7.99" />
2121
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
22+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
2223
<PackageReference Include="xunit" Version="$(xUnitVersion)" />
2324
<PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitVersion)" />
2425
<PackageReference Include="xunit.runner.console" Version="$(xUnitVersion)" />

‎StackExchange.Redis.sln‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RedisConfigs", "RedisConfig
2424
EndProject
2525
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis", "StackExchange.Redis\StackExchange.Redis.csproj", "{EF84877F-59BE-41BE-9013-E765AF0BB72E}"
2626
EndProject
27-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.StrongName", "StackExchange.Redis.StrongName\StackExchange.Redis.StrongName.csproj", "{46754D2A-AC16-4686-B113-3DB08ACF4269}"
28-
EndProject
2927
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.Tests", "StackExchange.Redis.Tests\StackExchange.Redis.Tests.csproj", "{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}"
3028
EndProject
3129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTest", "BasicTest\BasicTest.csproj", "{939FA5F7-16AA-4847-812B-6EBC3748A86D}"
@@ -81,14 +79,6 @@ Global
8179
{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Release|Any CPU.Build.0 = Release|Any CPU
8280
{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Verbose|Any CPU.ActiveCfg = Release|Any CPU
8381
{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Verbose|Any CPU.Build.0 = Release|Any CPU
84-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Debug|Any CPU.Build.0 = Debug|Any CPU
86-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Log Output|Any CPU.ActiveCfg = Release|Any CPU
87-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Log Output|Any CPU.Build.0 = Release|Any CPU
88-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Release|Any CPU.ActiveCfg = Release|Any CPU
89-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Release|Any CPU.Build.0 = Release|Any CPU
90-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Verbose|Any CPU.ActiveCfg = Release|Any CPU
91-
{46754D2A-AC16-4686-B113-3DB08ACF4269}.Verbose|Any CPU.Build.0 = Release|Any CPU
9282
{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9383
{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
9484
{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Log Output|Any CPU.ActiveCfg = Release|Any CPU

‎StackExchange.Redis/StackExchange.Redis.csproj‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<PackageId>StackExchange.Redis</PackageId>
99
<PackageTags>Async;Redis;Cache;PubSub;Messaging</PackageTags>
1010
<OutputTypeEx>Library</OutputTypeEx>
11+
<SignAssembly>true</SignAssembly>
12+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1113
</PropertyGroup>
1214

1315
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
@@ -20,12 +22,14 @@
2022
</PropertyGroup>
2123

2224
<ItemGroup>
23-
<PackageReference Include="System.IO.Compression" Version="$(CoreFxVersion)" />
25+
<!-- theses intentionally does not track CoreFxVersion -->
26+
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
27+
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" />
28+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
29+
30+
<!--<PackageReference Include="System.Memory" Version="$(CoreFxVersion)" />
31+
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
32+
<PackageReference Include="System.IO.Pipelines" Version="$(CoreFxVersion)" />
33+
<PackageReference Include="Pipelines.Sockets.Unofficial" Version="0.2.0-alpha-001" />-->
2434
</ItemGroup>
25-
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
27-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(CoreFxVersion)" />
28-
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="$(CoreFxVersion)" />
29-
</ItemGroup>
30-
3135
</Project>

‎StackExchange.Redis/StackExchange/AssemblyInfoHack.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Yes, this is embarassing. However, in .NET Core the including AssemblyInfo (ifdef'd or not) will screw with
22
// your version numbers. Therefore, we need to move the attribute out into another file...this file.
33
// When .csproj merges in, this should be able to return to Properties/AssemblyInfo.cs
4-
#if !STRONG_NAME
54
using System.Runtime.CompilerServices;
6-
[assembly: InternalsVisibleTo("StackExchange.Redis.Tests")]
7-
#endif
5+
[assembly: InternalsVisibleTo("StackExchange.Redis.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007791a689e9d8950b44a9a8886baad2ea180e7a8a854f158c9b98345ca5009cdd2362c84f368f1c3658c132b3c0f74e44ff16aeb2e5b353b6e0fe02f923a050470caeac2bde47a2238a9c7125ed7dab14f486a5a64558df96640933b9f2b6db188fc4a820f96dce963b662fa8864adbff38e5b4542343f162ecdc6dad16912fff")]

‎StackExchange.Redis/StackExchange/Redis/KeyspaceIsolation/WrapperBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public Task<RedisValue> DebugObjectAsync(RedisKey key, CommandFlags flags = Comm
2828
public Task<bool> GeoAddAsync(RedisKey key, double longitude, double latitude, RedisValue member, CommandFlags flags = CommandFlags.None)
2929
=> Inner.GeoAddAsync(ToInner(key), longitude, latitude, member, flags);
3030

31-
public Task<bool> GeoAddAsync(RedisKey key, StackExchange.Redis.GeoEntry value, CommandFlags flags = CommandFlags.None)
31+
public Task<bool> GeoAddAsync(RedisKey key, GeoEntry value, CommandFlags flags = CommandFlags.None)
3232
=> Inner.GeoAddAsync(ToInner(key), value, flags);
3333

34-
public Task<long> GeoAddAsync(RedisKey key, StackExchange.Redis.GeoEntry[] values, CommandFlags flags = CommandFlags.None)
34+
public Task<long> GeoAddAsync(RedisKey key, GeoEntry[] values, CommandFlags flags = CommandFlags.None)
3535
=> Inner.GeoAddAsync(ToInner(key), values, flags);
3636

3737
public Task<bool> GeoRemoveAsync(RedisKey key, RedisValue member, CommandFlags flags = CommandFlags.None)

0 commit comments

Comments
 (0)