Skip to content

Commit cd15d87

Browse files
mgravellmgravell
committed
Build tooling tweaks; preparing to ship a build
1 parent 4cc88fc commit cd15d87

33 files changed

+220
-1180
lines changed

‎BasicTest/BasicTest.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22

33
<PropertyGroup>
44
<Description>StackExchange.Redis.BasicTest .NET Core</Description>
5-
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<TargetFramework>netcoreapp1.1</TargetFramework>
6+
<TargetFrameworks>$(TargetFramework)</TargetFrameworks>
67
<AssemblyName>BasicTest</AssemblyName>
78
<OutputType>Exe</OutputType>
89
<PackageId>BasicTest</PackageId>
910
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
10-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
1111
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
1515
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />
1616
</ItemGroup>
1717

18-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
18+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
1919
<DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants>
2020
</PropertyGroup>
2121

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
23-
<PackageReference Include="System.Console" Version="4.0.0" />
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
23+
<PackageReference Include="System.Console" Version="$(CoreFxVersion)" />
2424
</ItemGroup>
2525

2626
</Project>

‎BasicTest/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void MassiveBulkOpsAsync(int AsyncOpsQty, bool preserveOrder, bool withCo
108108
AsyncOpsQty / watch.Elapsed.TotalSeconds);
109109
}
110110
}
111-
protected static string Me([CallerMemberName] string caller = null)
111+
internal static string Me([CallerMemberName] string caller = null)
112112
{
113113
return caller;
114114
}

‎Directory.build.props‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>1.2.2</VersionPrefix>
4+
5+
<Copyright>2017 Stack Exchange, Inc.</Copyright>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<AssemblyOriginatorKeyFile>../StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
9+
<PackageId>$(AssemblyName)</PackageId>
10+
<Authors>Stack Exchange inc., marc.gravell</Authors>
11+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
13+
14+
<PackageReleaseNotes>https://stackexchange.github.io/StackExchange.Redis/ReleaseNotes</PackageReleaseNotes>
15+
<PackageProjectUrl>https://github.com/StackExchange/StackExchange.Redis/</PackageProjectUrl>
16+
<PackageLicenseUrl>https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE</PackageLicenseUrl>
17+
18+
<RepositoryType>git</RepositoryType>
19+
<RepositoryUrl>https://github.com/StackExchange/StackExchange.Redis/</RepositoryUrl>
20+
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>embedded</DebugType>
23+
<DefaultLanguage>en-US</DefaultLanguage>
24+
<IncludeSymbols>false</IncludeSymbols>
25+
26+
<TargetFrameworks>net45;net46;netstandard1.5</TargetFrameworks><!--net40;-->
27+
<CoreFxVersion>4.3.0</CoreFxVersion>
28+
29+
</PropertyGroup>
30+
31+
<ItemGroup>
32+
<PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="All" />
33+
<DotNetCliToolReference Include="dotnet-sourcelink" Version="2.0.2" />
34+
<DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" />
35+
</ItemGroup>
36+
</Project>

‎MigratedBookSleeveTestSuite/MigratedBookSleeveTestSuite.csproj‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
44
<Description>MigratedBookSleeveTestSuite</Description>
55
<TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks>
66
<AssemblyName>MigratedBookSleeveTestSuite</AssemblyName>
77
<PackageId>MigratedBookSleeveTestSuite</PackageId>
8+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
89
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
910
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
1011
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
@@ -16,40 +17,40 @@
1617
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
1718
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1819
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
19-
</PropertyGroup>
20-
20+
</PropertyGroup>
21+
2122
<ItemGroup>
2223
<None Include="App.config" />
23-
</ItemGroup>
24-
24+
</ItemGroup>
25+
2526
<ItemGroup>
2627
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />
27-
</ItemGroup>
28-
28+
</ItemGroup>
29+
2930
<ItemGroup>
3031
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
3132
<PackageReference Include="nunit" Version="3.4.1" />
32-
</ItemGroup>
33-
33+
</ItemGroup>
34+
3435
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3536
<Reference Include="System" />
3637
<Reference Include="Microsoft.CSharp" />
37-
</ItemGroup>
38-
38+
</ItemGroup>
39+
3940
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
4041
<DefineConstants>$(DefineConstants);PLAT_SAFE_CONTINUATIONS;CORE_CLR</DefineConstants>
41-
</PropertyGroup>
42-
42+
</PropertyGroup>
43+
4344
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
44-
<PackageReference Include="System.Console" Version="4.0.0" />
45-
<PackageReference Include="System.Diagnostics.Debug" Version="4.0.11" />
46-
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
47-
<PackageReference Include="System.Linq.Expressions" Version="4.1.0" />
48-
<PackageReference Include="System.Reflection.Extensions" Version="4.0.1" />
49-
<PackageReference Include="System.Runtime.InteropServices" Version="4.1.0" />
50-
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.0.1" />
51-
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
45+
<PackageReference Include="System.Console" Version="$(CoreFxVersion)" />
46+
<PackageReference Include="System.Diagnostics.Debug" Version="$(CoreFxVersion)" />
47+
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(CoreFxVersion)" />
48+
<PackageReference Include="System.Linq.Expressions" Version="$(CoreFxVersion)" />
49+
<PackageReference Include="System.Reflection.Extensions" Version="$(CoreFxVersion)" />
50+
<PackageReference Include="System.Runtime.InteropServices" Version="$(CoreFxVersion)" />
51+
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(CoreFxVersion)" />
52+
<PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)" />
5253
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-1" />
53-
</ItemGroup>
54-
55-
</Project>
54+
</ItemGroup>
55+
56+
</Project>

‎MigratedBookSleeveTestSuite/Program.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ namespace Tests
99
{
1010
class Program
1111
{
12-
static void Main()
13-
{
14-
try
15-
{
16-
Main2();
17-
}
18-
catch (Exception ex)
19-
{
20-
Console.WriteLine();
21-
Console.WriteLine("CRAZY ERRORS: " + ex);
22-
}
23-
finally
24-
{
25-
Console.WriteLine("Press any key to exit");
26-
Console.ReadKey();
27-
}
28-
}
12+
// static void Main()
13+
// {
14+
// try
15+
// {
16+
// Main2();
17+
// }
18+
// catch (Exception ex)
19+
// {
20+
// Console.WriteLine();
21+
// Console.WriteLine("CRAZY ERRORS: " + ex);
22+
// }
23+
// finally
24+
// {
25+
// Console.WriteLine("Press any key to exit");
26+
// Console.ReadKey();
27+
// }
28+
// }
2929
static void Main2()
3030
{
3131
#if !CORE_CLR

‎NRediSearch.Test/NRediSearch.Test.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<TargetFrameworks>$(TargetFramework)</TargetFrameworks>
6+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
57
</PropertyGroup>
68

79
<ItemGroup>
@@ -11,7 +13,7 @@
1113
<ProjectReference Include="..\NRediSearch\NRediSearch.csproj" />
1214
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />
1315
</ItemGroup>
14-
16+
1517
<ItemGroup>
1618
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
1719
</ItemGroup>

‎NRediSearch/Client.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,13 @@ public async Task<long> OptimizeIndexAsync()
328328
/// Get the size of an autoc-complete suggestion dictionary
329329
/// </summary>
330330
public long CountSuggestions()
331-
=> (long)DbSync.Execute("FT.SUGLEN".Literal(), _boxedIndexName);
331+
=> (long)DbSync.Execute("FT.SUGLEN", _boxedIndexName);
332332

333333
/// <summary>
334334
/// Get the size of an autoc-complete suggestion dictionary
335335
/// </summary>
336336
public async Task<long> CountSuggestionsAsync()
337-
=> (long)await _db.ExecuteAsync("FT.SUGLEN".Literal(), _boxedIndexName).ConfigureAwait(false);
337+
=> (long)await _db.ExecuteAsync("FT.SUGLEN", _boxedIndexName).ConfigureAwait(false);
338338

339339
/// <summary>
340340
/// Add a suggestion string to an auto-complete suggestion dictionary. This is disconnected from the index definitions, and leaves creating and updating suggestino dictionaries to the user.

‎NRediSearch/NRediSearch.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
33
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;netstandard1.5</TargetFrameworks><!--net40;-->
4+
<VersionPrefix>0.1</VersionPrefix>
5+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
56
</PropertyGroup>
67
<ItemGroup>
78
<ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj" />

‎NRediSearch/Schema.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public Schema AddTextField(string name, double weight = 1.0)
8080
/// <summary>
8181
/// Add a numeric field to the schema
8282
/// </summary>
83-
/// <param name="name">the field's name</param
83+
/// <param name="name">the field's name</param>
8484
/// <returns>the schema object</returns>
8585
public Schema AddGeoField(string name)
8686
{
@@ -91,7 +91,7 @@ public Schema AddGeoField(string name)
9191
/// <summary>
9292
/// Add a numeric field to the schema
9393
/// </summary>
94-
/// <param name="name">the field's name</param
94+
/// <param name="name">the field's name</param>
9595
/// <returns>the schema object</returns>
9696
public Schema AddNumericField(string name)
9797
{

0 commit comments

Comments
 (0)