2.0.0-rc1 preparation

rsdn · Dec 24, 2017 · 1637c32 · 1637c32
1 parent 59a7e17
commit 1637c32
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Build/CodeJam.Default.props b/Build/CodeJam.Default.props
@@ -13,7 +13,7 @@
 		<DelaySign>False</DelaySign>
 
 		<Version>2.0.0.0</Version>
-		<PackageVersion>2.0.0-beta1</PackageVersion>
+		<PackageVersion>2.0.0-rc1</PackageVersion>
 		<PackageOutputPath>..\..\_Results</PackageOutputPath>
 
 		<Company>RSDN.ru</Company>

diff --git a/Build/RunMe.BuildPublishConfiguration.cmd b/Build/RunMe.BuildPublishConfiguration.cmd
@@ -1 +1 @@
-msbuild CodeJam.sln /p:Configuration=Publish /t:Restore;Build
+"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild" CodeJam.sln /p:Configuration=Publish /t:Restore;Build
diff --git a/Main/src/Ranges/[CompositeRanges]/CompositeRange`2.Operations.generated.cs b/Main/src/Ranges/[CompositeRanges]/CompositeRange`2.Operations.generated.cs
@@ -9,7 +9,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 using CodeJam.Collections;
@@ -21,8 +20,6 @@
 namespace CodeJam.Ranges
 {
 	/// <summary>Describes a composite range that contains some subranges.</summary>
-	[SuppressMessage("ReSharper", "SuggestVarOrType_BuiltInTypes")]
-	[SuppressMessage("ReSharper", "ArrangeBraces_while")]
 	public partial struct CompositeRange<T, TKey>
 	{
 		#region Updating a range
@@ -647,6 +644,7 @@ public CompositeRange<T, TKey> Intersect(
 		#region T4-dont-replace
 			CompositeRange<T> other
 		#endregion
+
 			)
 		{
 			if (IsEmpty)
@@ -706,6 +704,7 @@ CompositeRange<T> other
 
 			return result;
 		}
+
 		/// <summary>Returns an intersection of the the ranges.</summary>
 		/// <typeparam name="TKey2">The type of the key of another range.</typeparam>
 		/// <param name="other">The range to intersect with.</param>
@@ -867,12 +866,15 @@ public CompositeRange<T, TKey> Except<TKey2>(CompositeRange<T, TKey2> other)
 		/// Result range contains result of (infinityRange.Exclude(this).
 		/// </summary>
 		/// <returns>Complementation composite range.</returns>
+
 		#region T4-dont-replace
 		[Pure]
 		public CompositeRange<T> GetComplementation()
 		{
 			if (IsEmpty)
 			{
+				// ReSharper disable once ArrangeStaticMemberQualifier
+				// Used for codegen
 				return CompositeRange<T>.Infinite;
 			}
 
@@ -910,6 +912,7 @@ public CompositeRange<T> GetComplementation()
 			return new CompositeRange<T>(result, UnsafeOverload.NoEmptyRangesAlreadySortedAndMerged);
 		}
 		#endregion
+
 		#endregion
 	}
 }
diff --git a/Main/src/Ranges/[Helper types]/RangeIntersection`2.generated.cs b/Main/src/Ranges/[Helper types]/RangeIntersection`2.generated.cs
@@ -25,7 +25,7 @@ namespace CodeJam.Ranges
 	/// </summary>
 	/// <typeparam name="T">The type of the range values.</typeparam>
 	/// <typeparam name="TKey">The type of the range key</typeparam>
-	/// <seealso cref="System.IFormattable" />
+	/// <seealso cref="System.IFormattable"/>
 	[PublicAPI]
 	public struct RangeIntersection<T, TKey> : IFormattable
 	{
@@ -38,6 +38,7 @@ public struct RangeIntersection<T, TKey> : IFormattable
 		/// <param name="intersectionRange">The intersection range.</param>
 		/// <param name="ranges">Intersecting ranges.</param>
 		internal RangeIntersection(
+
 		#region T4-dont-replace
 			Range<T> intersectionRange,
 		#endregion

diff --git a/Main/src/Ranges/[RangeExtensions]/CompositeRangeExtensions.WithKey.generated.cs b/Main/src/Ranges/[RangeExtensions]/CompositeRangeExtensions.WithKey.generated.cs
@@ -10,14 +10,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-using CodeJam.Collections;
 
 using JetBrains.Annotations;
 
-using static CodeJam.Ranges.CompositeRangeInternal;
-
 namespace CodeJam.Ranges
 {
 	/// <summary>Extension methods for <seealso cref="CompositeRange{T}"/>.</summary>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		msbuild CodeJam.sln /p:Configuration=Publish /t:Restore;Build
		"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild" CodeJam.sln /p:Configuration=Publish /t:Restore;Build