Skip to content

Commit 1637c32

Browse files
committed
2.0.0-rc1 preparation
1 parent 59a7e17 commit 1637c32

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

Build/CodeJam.Default.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<DelaySign>False</DelaySign>
1414

1515
<Version>2.0.0.0</Version>
16-
<PackageVersion>2.0.0-beta1</PackageVersion>
16+
<PackageVersion>2.0.0-rc1</PackageVersion>
1717
<PackageOutputPath>..\..\_Results</PackageOutputPath>
1818

1919
<Company>RSDN.ru</Company>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msbuild CodeJam.sln /p:Configuration=Publish /t:Restore;Build
1+
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild" CodeJam.sln /p:Configuration=Publish /t:Restore;Build

Main/src/Ranges/[CompositeRanges]/CompositeRange`2.Operations.generated.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
using System;
1111
using System.Collections.Generic;
12-
using System.Diagnostics.CodeAnalysis;
1312
using System.Linq;
1413

1514
using CodeJam.Collections;
@@ -21,8 +20,6 @@
2120
namespace CodeJam.Ranges
2221
{
2322
/// <summary>Describes a composite range that contains some subranges.</summary>
24-
[SuppressMessage("ReSharper", "SuggestVarOrType_BuiltInTypes")]
25-
[SuppressMessage("ReSharper", "ArrangeBraces_while")]
2623
public partial struct CompositeRange<T, TKey>
2724
{
2825
#region Updating a range
@@ -647,6 +644,7 @@ public CompositeRange<T, TKey> Intersect(
647644
#region T4-dont-replace
648645
CompositeRange<T> other
649646
#endregion
647+
650648
)
651649
{
652650
if (IsEmpty)
@@ -706,6 +704,7 @@ CompositeRange<T> other
706704

707705
return result;
708706
}
707+
709708
/// <summary>Returns an intersection of the the ranges.</summary>
710709
/// <typeparam name="TKey2">The type of the key of another range.</typeparam>
711710
/// <param name="other">The range to intersect with.</param>
@@ -867,12 +866,15 @@ public CompositeRange<T, TKey> Except<TKey2>(CompositeRange<T, TKey2> other)
867866
/// Result range contains result of (infinityRange.Exclude(this).
868867
/// </summary>
869868
/// <returns>Complementation composite range.</returns>
869+
870870
#region T4-dont-replace
871871
[Pure]
872872
public CompositeRange<T> GetComplementation()
873873
{
874874
if (IsEmpty)
875875
{
876+
// ReSharper disable once ArrangeStaticMemberQualifier
877+
// Used for codegen
876878
return CompositeRange<T>.Infinite;
877879
}
878880

@@ -910,6 +912,7 @@ public CompositeRange<T> GetComplementation()
910912
return new CompositeRange<T>(result, UnsafeOverload.NoEmptyRangesAlreadySortedAndMerged);
911913
}
912914
#endregion
915+
913916
#endregion
914917
}
915918
}

Main/src/Ranges/[Helper types]/RangeIntersection`2.generated.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace CodeJam.Ranges
2525
/// </summary>
2626
/// <typeparam name="T">The type of the range values.</typeparam>
2727
/// <typeparam name="TKey">The type of the range key</typeparam>
28-
/// <seealso cref="System.IFormattable" />
28+
/// <seealso cref="System.IFormattable"/>
2929
[PublicAPI]
3030
public struct RangeIntersection<T, TKey> : IFormattable
3131
{
@@ -38,6 +38,7 @@ public struct RangeIntersection<T, TKey> : IFormattable
3838
/// <param name="intersectionRange">The intersection range.</param>
3939
/// <param name="ranges">Intersecting ranges.</param>
4040
internal RangeIntersection(
41+
4142
#region T4-dont-replace
4243
Range<T> intersectionRange,
4344
#endregion

Main/src/Ranges/[RangeExtensions]/CompositeRangeExtensions.WithKey.generated.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,9 @@
1010
using System;
1111
using System.Collections.Generic;
1212
using System.Diagnostics.CodeAnalysis;
13-
using System.Linq;
14-
15-
using CodeJam.Collections;
1613

1714
using JetBrains.Annotations;
1815

19-
using static CodeJam.Ranges.CompositeRangeInternal;
20-
2116
namespace CodeJam.Ranges
2217
{
2318
/// <summary>Extension methods for <seealso cref="CompositeRange{T}"/>.</summary>

0 commit comments

Comments
 (0)