Skip to content

S
StackExchange.Redis
Commit 944287b0 authored by Nick Craver's avatar Nick Craver
Browse files
Options

Tidy up csproj and remove .StrongName 

We decided this won't help anyone long-term, as the signature to types still differs. With strong naming you *could* load both as a workaround, but the upgrade cutover has to happen at some point and this does it for the 2.0 release.
parent fb8507ce
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 116 deletions
StackExchange.Redis.sln
View file @ 944287b0
...@@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestBaseline", "tests\ ...@@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestBaseline", "tests\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsole", "toys\TestConsole\TestConsole.csproj", "{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsole", "toys\TestConsole\TestConsole.csproj", "{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.StrongName", "src\StackExchange.Redis.StrongName\StackExchange.Redis.StrongName.csproj", "{769640F3-889C-4E8A-A7DF-916AE9B432A6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Failover", "Failover", "{D082703F-1652-4C35-840D-7D377F6B9979}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Failover", "Failover", "{D082703F-1652-4C35-840D-7D377F6B9979}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
RedisConfigs\Failover\master-6382.conf = RedisConfigs\Failover\master-6382.conf RedisConfigs\Failover\master-6382.conf = RedisConfigs\Failover\master-6382.conf
...@@ -127,10 +125,6 @@ Global ...@@ -127,10 +125,6 @@ Global
{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Debug|Any CPU.Build.0 = Debug|Any CPU {651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Release|Any CPU.ActiveCfg = Release|Any CPU {651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Release|Any CPU.Build.0 = Release|Any CPU {651FDB97-9DE3-4BD9-9A05-827AF8F1A94A}.Release|Any CPU.Build.0 = Release|Any CPU
{769640F3-889C-4E8A-A7DF-916AE9B432A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{769640F3-889C-4E8A-A7DF-916AE9B432A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{769640F3-889C-4E8A-A7DF-916AE9B432A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{769640F3-889C-4E8A-A7DF-916AE9B432A6}.Release|Any CPU.Build.0 = Release|Any CPU
{8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Debug|Any CPU.Build.0 = Debug|Any CPU {8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Release|Any CPU.ActiveCfg = Release|Any CPU {8375813E-FBAF-4DA3-A2C7-E4645B39B931}.Release|Any CPU.ActiveCfg = Release|Any CPU
...@@ -155,7 +149,6 @@ Global ...@@ -155,7 +149,6 @@ Global
{38BDEEED-7BEB-4B1F-9CE0-256D63F9C502} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05} {38BDEEED-7BEB-4B1F-9CE0-256D63F9C502} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
{8FDB623D-779B-4A84-BC6B-75106E41D8A4} = {73A5C363-CA1F-44C4-9A9B-EF791A76BA6A} {8FDB623D-779B-4A84-BC6B-75106E41D8A4} = {73A5C363-CA1F-44C4-9A9B-EF791A76BA6A}
{651FDB97-9DE3-4BD9-9A05-827AF8F1A94A} = {E25031D3-5C64-430D-B86F-697B66816FD8} {651FDB97-9DE3-4BD9-9A05-827AF8F1A94A} = {E25031D3-5C64-430D-B86F-697B66816FD8}
{769640F3-889C-4E8A-A7DF-916AE9B432A6} = {00CA0876-DA9F-44E8-B0DC-A88716BF347A}
{D082703F-1652-4C35-840D-7D377F6B9979} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05} {D082703F-1652-4C35-840D-7D377F6B9979} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
{8375813E-FBAF-4DA3-A2C7-E4645B39B931} = {E25031D3-5C64-430D-B86F-697B66816FD8} {8375813E-FBAF-4DA3-A2C7-E4645B39B931} = {E25031D3-5C64-430D-B86F-697B66816FD8}
{3DA1EEED-E9FE-43D9-B293-E000CFCCD91A} = {E25031D3-5C64-430D-B86F-697B66816FD8} {3DA1EEED-E9FE-43D9-B293-E000CFCCD91A} = {E25031D3-5C64-430D-B86F-697B66816FD8}
......
src/StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj deleted 100644 → 0
View file @ fb8507ce
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
<Description>High performance Redis client, incorporating both synchronous and asynchronous usage.</Description>
<AssemblyTitle>StackExchange.Redis.StrongName</AssemblyTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>StackExchange.Redis.StrongName</AssemblyName>
<PackageId>StackExchange.Redis.StrongName</PackageId>
<PackageTags>Async;Redis;Cache;PubSub;Messaging</PackageTags>
<OutputTypeEx>Library</OutputTypeEx>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />
</ItemGroup>
</Project>
\ No newline at end of file
src/StackExchange.Redis.StrongName/TypeForwarding.cs deleted 100644 → 0
View file @ fb8507ce
using System.Runtime.CompilerServices;
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Aggregate))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Bitwise))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClientFlags))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClientInfo))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClientType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClusterConfiguration))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClusterNode))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.CommandFlags))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.CommandMap))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.CommandStatus))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.CommandTrace))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Condition))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConditionResult))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConfigurationOptions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConnectionCounters))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConnectionFailedEventArgs))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConnectionFailureType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConnectionMultiplexer))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ConnectionType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.EndPointCollection))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.EndPointEventArgs))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Exclude))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ExponentialRetry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ExportOptions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ExtensionMethods))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.GeoEntry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.GeoPosition))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.GeoRadiusOptions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.GeoRadiusResult))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.GeoUnit))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.HashEntry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.HashSlotMovedEventArgs))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IBatch))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IConnectionMultiplexer))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IDatabase))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IDatabaseAsync))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Profiling.IProfiledCommand))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IReconnectRetryPolicy))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IRedis))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IRedisAsync))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IScanningCursor))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.IServer))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ISubscriber))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ITransaction))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.InternalErrorEventArgs))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.KeyspaceIsolation.DatabaseExtensions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.LinearRetry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.LoadedLuaScript))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.LuaScript))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.MigrateOptions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Order))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Profiling.ProfiledCommandEnumerable))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Profiling.ProfilingSession))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Proxy))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisChannel))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisCommandException))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisConnectionException))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisErrorEventArgs))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisException))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisFeatures))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisKey))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisResult))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisServerException))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisTimeoutException))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisValue))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RedisValueWithExpiry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ReplicationChangeOptions))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.RetransmissionReasonType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SaveType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ServerCounters))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ServerType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SetOperation))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ShutdownMode))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SlotRange))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SocketManager))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SortType))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.SortedSetEntry))]
[assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.When))]
src/StackExchange.Redis/PhysicalConnection.cs
View file @ 944287b0
...@@ -283,14 +283,8 @@ public Task FlushAsync() ...@@ -283,14 +283,8 @@ public Task FlushAsync()
public void RecordConnectionFailed(ConnectionFailureType failureType, Exception innerException = null, [CallerMemberName] string origin = null, public void RecordConnectionFailed(ConnectionFailureType failureType, Exception innerException = null, [CallerMemberName] string origin = null,
bool isInitialConnect = false, IDuplexPipe connectingPipe = null bool isInitialConnect = false, IDuplexPipe connectingPipe = null
#if TEST
, [CallerFilePath] string path = default, [CallerLineNumber] int line = default
#endif
) )
{ {
#if TEST
origin += $" ({path}#{line})";
#endif
Exception outerException = innerException; Exception outerException = innerException;
IdentifyFailureType(innerException, ref failureType); IdentifyFailureType(innerException, ref failureType);
var bridge = BridgeCouldBeNull; var bridge = BridgeCouldBeNull;
......
src/StackExchange.Redis/StackExchange.Redis.csproj
View file @ 944287b0
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<!-- we should preferably not include this in release builds, but isn't dramatic -->
<DefineConstants>$(DefineConstants);TEST</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' != 'net461'">$(DefineConstants);VECTOR_SAFE</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' != 'net461'">$(DefineConstants);VECTOR_SAFE</DefineConstants>
</PropertyGroup> </PropertyGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment