Fix dependencies. 2.1.1 prep.

andrewvk · andrewvk · commit ea6d30c0cfca · 2018-06-17T11:25:21.000+03:00
diff --git a/Blocks/src/CodeJam.Blocks.csproj b/Blocks/src/CodeJam.Blocks.csproj
@@ -51,7 +51,7 @@
 		<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
 		<DocumentationFile>$(OutputPath)$(TargetFramework)\$(ProjectName).xml</DocumentationFile>
 	</PropertyGroup>
-	
+
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net35'">
 		<AssemblyAttribute Include="System.Runtime.Versioning.TargetFrameworkAttribute">
 			<_Parameter1>.NETFramework,Version=v3.5</_Parameter1>
diff --git a/Blocks/src/Readme.txt b/Blocks/src/Readme.txt
@@ -1,6 +1,11 @@
-﻿CodeJam.Blocks 2.1.0 Release Notes
+﻿CodeJam.Blocks 2.1.1 Release Notes
 ----------------------------------
 
+What's new in 2.1.1
+-----------------------
+* Fix package dependencies
+* Fix version
+
 What's new in 2.1.0-rc1
 -----------------------
 * FW 4.7.2 support
diff --git a/Blocks/src/TableData/CsvFormat.cs b/Blocks/src/TableData/CsvFormat.cs
@@ -61,7 +61,7 @@ public static string EscapeValue(string value)
 		public static Parser CreateParser(bool allowEscaping = true, char columnSeparator = ',') =>
 			allowEscaping
 				? (Parser)((TextReader rdr, ref int ln) => ParseCsv(rdr, ref ln, columnSeparator))
-				: ((TextReader rdr, ref int ln) => ParseCsvNoEscape(rdr, ref ln, columnSeparator));
+				: (TextReader rdr, ref int ln) => ParseCsvNoEscape(rdr, ref ln, columnSeparator);
 
 		/// <summary>Parses CSV data.</summary>
 		/// <param name="reader">Text to parse</param>
diff --git a/Build/CodeJam.Default.props b/Build/CodeJam.Default.props
@@ -13,7 +13,7 @@
 		<DelaySign>False</DelaySign>
 
 		<Version>2.1.0.0</Version>
-		<PackageVersion>2.1.0</PackageVersion>
+		<PackageVersion>2.1.1</PackageVersion>
 		<PackageOutputPath>..\..\_Results</PackageOutputPath>
 
 		<Company>RSDN</Company>
diff --git a/Build/CodeJam.Targeting.props b/Build/CodeJam.Targeting.props
@@ -2,9 +2,9 @@
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
 		<DefineConstants>$(DefineConstants);DEFAULT_PLATFORM</DefineConstants>
 	</PropertyGroup>
-	
+
 	<!-- Generated from https://docs.microsoft.com/en-us/dotnet/standard/frameworks -->
-	
+
 	<!-- Monikers for full .net framework -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net11' ">
 		<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET20;LESSTHAN_NET35;LESSTHAN_NET40;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
@@ -48,7 +48,7 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net472' ">
 		<DefineConstants>$(DefineConstants);TARGETS_NET</DefineConstants>
 	</PropertyGroup>
-	
+
 	<!-- Monikers for .Net standard -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0' ">
 		<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD11;LESSTHAN_NETSTANDARD12;LESSTHAN_NETSTANDARD13;LESSTHAN_NETSTANDARD14;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
@@ -74,7 +74,7 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
 		<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD</DefineConstants>
 	</PropertyGroup>
-	
+
 	<!-- Monikers for .Net Core -->
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' ">
 		<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP11;LESSTHAN_NETCOREAPP20;LESSTHAN_NETCOREAPP21</DefineConstants>
diff --git a/Main/src/CodeJam.Main.csproj b/Main/src/CodeJam.Main.csproj
@@ -66,6 +66,7 @@
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
+		<PackageReference Include="System.ValueTuple" Version="4.4.0" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
 		<Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/Main/src/Ranges/[Boundaries]/RangeBoundaryTo`1.generated.cs b/Main/src/Ranges/[Boundaries]/RangeBoundaryTo`1.generated.cs
@@ -159,7 +159,8 @@ public RangeBoundaryTo(T value, RangeBoundaryToKind boundaryKind)
 				value = default;
 				if (boundaryKind != RangeBoundaryToKind.Infinite)
 				{
-					throw CodeExceptions.Argument(nameof(value), "The positive infinity value should be used only for Infinite boundaries.");
+					throw CodeExceptions.Argument(
+						nameof(value), "The positive infinity value should be used only for Infinite boundaries.");
 				}
 			}
 			if (_hasNegativeInfinity && _equalsFunc(value, _negativeInfinity))
diff --git a/Main/src/Ranges/[CompositeRanges]/CompositeRange`2.generated.cs b/Main/src/Ranges/[CompositeRanges]/CompositeRange`2.generated.cs
@@ -10,7 +10,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 using CodeJam.Collections;
@@ -38,7 +37,6 @@ namespace CodeJam.Ranges
 	/// <typeparam name="TKey">The type of the range key</typeparam>
 	[Serializable]
 	[PublicAPI]
-	[SuppressMessage("ReSharper", "SuggestVarOrType_BuiltInTypes")]
 	public partial struct CompositeRange<T, TKey> : IEquatable<CompositeRange<T, TKey>>, IFormattable
 	{
 		#region Nested types
@@ -55,7 +53,7 @@ private sealed class SubRangesComparer : IComparer<Range<T, TKey>>
 			/// <param name="x">The first object to compare.</param>
 			/// <param name="y">The second object to compare.</param>
 			/// <returns>
-			/// A signed integer that indicates the relative values of <paramref name="x" /> and <paramref name="y" />
+			/// A signed integer that indicates the relative values of <paramref name="x"/> and <paramref name="y"/>
 			/// </returns>
 			public int Compare(Range<T, TKey> x, Range<T, TKey> y)
 			{
@@ -224,7 +222,9 @@ internal CompositeRange([NotNull] IEnumerable<Range<T, TKey>> ranges, UnsafeOver
 		#endregion
 
 		#region Properties
-		/// <summary>The composite range cannot be simplified anymore. Subranges do not intersect and start one exactly after another.</summary>
+		/// <summary>
+		/// The composite range cannot be simplified anymore. Subranges do not intersect and start one exactly after another.
+		/// </summary>
 		/// <value><c>true</c> if all subranges are merged already; otherwise, <c>false</c>.</value>
 		public bool IsMerged => !_hasRangesToMerge;
 
diff --git a/Main/src/Ranges/[Ranges]/Range`2.Operations.generated.cs b/Main/src/Ranges/[Ranges]/Range`2.Operations.generated.cs
@@ -247,8 +247,10 @@ public bool HasIntersection<TKey2>(Range<T, TKey2> other)
 		public T Clamp(T value)
 		{
 			Code.AssertArgument(IsNotEmpty, nameof(value), "Cannot fit the value into empty range.");
-			Code.AssertArgument(!From.IsExclusiveBoundary, nameof(value), "The clamp range boundary From is exclusive and has no value.");
-			Code.AssertArgument(!To.IsExclusiveBoundary, nameof(value), "The clamp range boundary To is exclusive and has no value.");
+			Code.AssertArgument(
+				!From.IsExclusiveBoundary, nameof(value), "The clamp range boundary From is exclusive and has no value.");
+			Code.AssertArgument(
+				!To.IsExclusiveBoundary, nameof(value), "The clamp range boundary To is exclusive and has no value.");
 
 			// case for the positive infinity
 			if (!RangeBoundaryFrom<T>.IsValid(value))
diff --git a/Main/src/Readme.txt b/Main/src/Readme.txt
@@ -1,6 +1,11 @@
-﻿CodeJam 2.1.0 Release Notes
+﻿CodeJam 2.1.1 Release Notes
 ---------------------------
 
+What's new in 2.1.1
+-----------------------
+* Fix package dependencies
+* Fix version
+
 What's new in 2.1.0-rc1
 -----------------------
 * FW 4.7.2 support

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ public RangeBoundaryTo(T value, RangeBoundaryToKind boundaryKind)`
`159`	`159`	`value = default;`
`160`	`160`	`if (boundaryKind != RangeBoundaryToKind.Infinite)`
`161`	`161`	`{`
`162`		`- throw CodeExceptions.Argument(nameof(value), "The positive infinity value should be used only for Infinite boundaries.");`
	`162`	`+ throw CodeExceptions.Argument(`
	`163`	`+ nameof(value), "The positive infinity value should be used only for Infinite boundaries.");`
`163`	`164`	`}`
`164`	`165`	`}`
`165`	`166`	`if (_hasNegativeInfinity && _equalsFunc(value, _negativeInfinity))`