Skip to content

Commit 95ae5b6

Browse files
ig-sinicynig-sinicyn
committed
Support for FW 4.7.2.
1 parent 424aa92 commit 95ae5b6

10 files changed

+52
-42
lines changed

‎Blocks/src/CodeJam.Blocks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectGuid>{0DFF0859-2400-4487-83AD-0ED10203D6D9}</ProjectGuid>
1010
<EnableDefaultItems>false</EnableDefaultItems>
1111
<OutputType>Library</OutputType>
12-
<TargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net45;net40;net35</TargetFrameworks>
12+
<TargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net472;net45;net40;net35</TargetFrameworks>
1313

1414
<PackageId>CodeJam.Blocks</PackageId>
1515
<Title>CodeJam.Blocks library</Title>

‎Blocks/tests/CodeJam.Blocks-Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CodeJam</RootNamespace>
99
<ProjectGuid>{2A52D7F6-AAFC-4AC4-9901-252C13D96E53}</ProjectGuid>
1010
<OutputType>Library</OutputType>
11-
<TargetFrameworks>net461;netcoreapp2.0;net45;net40;net35</TargetFrameworks>
11+
<TargetFrameworks>net461;netcoreapp2.0;net472;net45;net40;net35</TargetFrameworks>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition=" '$(Configuration)' != 'Publish' ">

‎Build/CodeJam.Default.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<AssemblyOriginatorKeyFile>..\..\Build\CodeJam.snk</AssemblyOriginatorKeyFile>
1313
<DelaySign>False</DelaySign>
1414

15-
<Version>2.0.0.0</Version>
16-
<PackageVersion>2.0.0</PackageVersion>
15+
<Version>2.1.0.0</Version>
16+
<PackageVersion>2.1.0</PackageVersion>
1717
<PackageOutputPath>..\..\_Results</PackageOutputPath>
1818

1919
<Company>RSDN.ru</Company>
20-
<Copyright>RSDN.ru, 2017</Copyright>
20+
<Copyright>RSDN.ru, 2018</Copyright>
2121
<RepositoryUrl>https://github.com/rsdn/CodeJam</RepositoryUrl>
2222
<RepositoryType>git</RepositoryType>
2323
</PropertyGroup>

‎Build/CodeJam.Targeting.props‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,79 +7,85 @@
77

88
<!-- Monikers for full .net framework -->
99
<PropertyGroup Condition="'$(TargetFramework)' == 'net11' ">
10-
<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</DefineConstants>
10+
<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>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="'$(TargetFramework)' == 'net20' ">
13-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET35;LESSTHAN_NET40;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
13+
<DefineConstants>$(DefineConstants);TARGETS_NET;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>
1414
</PropertyGroup>
1515
<PropertyGroup Condition="'$(TargetFramework)' == 'net35' ">
16-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET40;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
16+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET40;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
1717
</PropertyGroup>
1818
<PropertyGroup Condition="'$(TargetFramework)' == 'net40' ">
19-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
19+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET403;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
2020
</PropertyGroup>
2121
<PropertyGroup Condition="'$(TargetFramework)' == 'net403' ">
22-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
22+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET45;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(TargetFramework)' == 'net45' ">
25-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
25+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET451;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(TargetFramework)' == 'net451' ">
28-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
28+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET452;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
2929
</PropertyGroup>
3030
<PropertyGroup Condition="'$(TargetFramework)' == 'net452' ">
31-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
31+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET46;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(TargetFramework)' == 'net46' ">
34-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
34+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET461;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(TargetFramework)' == 'net461' ">
37-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
37+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET462;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(TargetFramework)' == 'net462' ">
40-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET47;LESSTHAN_NET471</DefineConstants>
40+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET47;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(TargetFramework)' == 'net47' ">
43-
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET471</DefineConstants>
43+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET471;LESSTHAN_NET472</DefineConstants>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(TargetFramework)' == 'net471' ">
46+
<DefineConstants>$(DefineConstants);TARGETS_NET;LESSTHAN_NET472</DefineConstants>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(TargetFramework)' == 'net472' ">
4649
<DefineConstants>$(DefineConstants);TARGETS_NET</DefineConstants>
4750
</PropertyGroup>
4851

4952
<!-- Monikers for .Net standard -->
5053
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0' ">
51-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.1;LESSTHAN_NETSTANDARD1.2;LESSTHAN_NETSTANDARD1.3;LESSTHAN_NETSTANDARD1.4;LESSTHAN_NETSTANDARD1.5;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
54+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD11;LESSTHAN_NETSTANDARD12;LESSTHAN_NETSTANDARD13;LESSTHAN_NETSTANDARD14;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
5255
</PropertyGroup>
5356
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1' ">
54-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.2;LESSTHAN_NETSTANDARD1.3;LESSTHAN_NETSTANDARD1.4;LESSTHAN_NETSTANDARD1.5;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
57+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD12;LESSTHAN_NETSTANDARD13;LESSTHAN_NETSTANDARD14;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
5558
</PropertyGroup>
5659
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.2' ">
57-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.3;LESSTHAN_NETSTANDARD1.4;LESSTHAN_NETSTANDARD1.5;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
60+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD13;LESSTHAN_NETSTANDARD14;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
5861
</PropertyGroup>
5962
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' ">
60-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.4;LESSTHAN_NETSTANDARD1.5;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
63+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD14;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
6164
</PropertyGroup>
6265
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4' ">
63-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.5;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
66+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD15;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
6467
</PropertyGroup>
6568
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.5' ">
66-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD1.6;LESSTHAN_NETSTANDARD2.0</DefineConstants>
69+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD16;LESSTHAN_NETSTANDARD20</DefineConstants>
6770
</PropertyGroup>
6871
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6' ">
69-
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD2.0</DefineConstants>
72+
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD;LESSTHAN_NETSTANDARD20</DefineConstants>
7073
</PropertyGroup>
7174
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
7275
<DefineConstants>$(DefineConstants);TARGETS_NETSTANDARD</DefineConstants>
7376
</PropertyGroup>
7477

7578
<!-- Monikers for .Net Core -->
7679
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' ">
77-
<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP1.1;LESSTHAN_NETCOREAPP2.0</DefineConstants>
80+
<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP11;LESSTHAN_NETCOREAPP20;LESSTHAN_NETCOREAPP21</DefineConstants>
7881
</PropertyGroup>
7982
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1' ">
80-
<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP2.0</DefineConstants>
83+
<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP20;LESSTHAN_NETCOREAPP21</DefineConstants>
8184
</PropertyGroup>
8285
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0' ">
86+
<DefineConstants>$(DefineConstants);TARGETS_NETCORE;LESSTHAN_NETCOREAPP21</DefineConstants>
87+
</PropertyGroup>
88+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' ">
8389
<DefineConstants>$(DefineConstants);TARGETS_NETCORE</DefineConstants>
8490
</PropertyGroup>
8591
</Project>

‎Main/src/CodeJam.Main.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectGuid>{2F2046CC-FB47-4318-B335-5A82B04B6C40}</ProjectGuid>
1010
<EnableDefaultItems>false</EnableDefaultItems>
1111
<OutputType>Library</OutputType>
12-
<TargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net45;net40;net35</TargetFrameworks>
12+
<TargetFrameworks>net461;netcoreapp2.0;netstandard2.0;net472;net45;net40;net35</TargetFrameworks>
1313

1414
<PackageId>CodeJam</PackageId>
1515
<Title>CodeJam library</Title>
@@ -50,7 +50,7 @@
5050
<DebugType>pdbonly</DebugType>
5151
<Optimize>true</Optimize>
5252
<OutputPath>bin\Publish\</OutputPath>
53-
<DefineConstants>$(DefineConstants);TRACE1</DefineConstants>
53+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
5454
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5555
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(ProjectName).xml</DocumentationFile>
5656
</PropertyGroup>
@@ -67,6 +67,10 @@
6767
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
6868
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
6969
</ItemGroup>
70+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
71+
<Reference Include="System.ComponentModel.DataAnnotations" />
72+
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
73+
</ItemGroup>
7074
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
7175
<Reference Include="System.ComponentModel.DataAnnotations" />
7276
<PackageReference Include="System.ValueTuple" Version="4.4.0" />

‎Main/src/Collections/Dictionary/DictionaryExtensions.GetValueOrDefault.generated.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace CodeJam.Collections
1818
partial class DictionaryExtensions
1919
{
2020
#region IDictionary<TKey, TValue> overloads
21-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
21+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
2222
/// <summary>
2323
/// Returns value associated with <paramref name="key"/>, or default(TValue) if key does not exists in
2424
/// <paramref name="dictionary"/>
@@ -36,7 +36,7 @@ public static TValue GetValueOrDefault<TKey, TValue>([NotNull] this IDictionary<
3636
=> GetValueOrDefault(dictionary, key, default(TValue));
3737
#endif
3838

39-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
39+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
4040
/// <summary>
4141
/// Returns value associated with <paramref name="key"/>, or <paramref name="defaultValue"/> if key does not exists
4242
/// in <paramref name="dictionary"/>
@@ -183,7 +183,7 @@ public static TResult GetValueOrDefault<TKey, TValue, TResult>(
183183
#endregion
184184

185185
#region IReadOnlyDictionary<TKey, TValue> overloads
186-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
186+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
187187
/// <summary>
188188
/// Returns value associated with <paramref name="key"/>, or default(TValue) if key does not exists in
189189
/// <paramref name="dictionary"/>
@@ -201,7 +201,7 @@ public static TValue GetValueOrDefault<TKey, TValue>([NotNull] this IReadOnlyDic
201201
=> GetValueOrDefault(dictionary, key, default(TValue));
202202
#endif
203203

204-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
204+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
205205
/// <summary>
206206
/// Returns value associated with <paramref name="key"/>, or <paramref name="defaultValue"/> if key does not exists
207207
/// in <paramref name="dictionary"/>
@@ -348,7 +348,7 @@ public static TResult GetValueOrDefault<TKey, TValue, TResult>(
348348
#endregion
349349

350350
#region Dictionary<TKey, TValue> overloads
351-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
351+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
352352
/// <summary>
353353
/// Returns value associated with <paramref name="key"/>, or default(TValue) if key does not exists in
354354
/// <paramref name="dictionary"/>
@@ -366,7 +366,7 @@ public static TValue GetValueOrDefault<TKey, TValue>([NotNull] this Dictionary<T
366366
=> GetValueOrDefault(dictionary, key, default(TValue));
367367
#endif
368368

369-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
369+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
370370
/// <summary>
371371
/// Returns value associated with <paramref name="key"/>, or <paramref name="defaultValue"/> if key does not exists
372372
/// in <paramref name="dictionary"/>
@@ -513,7 +513,7 @@ public static TResult GetValueOrDefault<TKey, TValue, TResult>(
513513
#endregion
514514

515515
#region ConcurrentDictionary<TKey, TValue> overloads
516-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
516+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
517517
/// <summary>
518518
/// Returns value associated with <paramref name="key"/>, or default(TValue) if key does not exists in
519519
/// <paramref name="dictionary"/>
@@ -531,7 +531,7 @@ public static TValue GetValueOrDefault<TKey, TValue>([NotNull] this ConcurrentDi
531531
=> GetValueOrDefault(dictionary, key, default(TValue));
532532
#endif
533533

534-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
534+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
535535
/// <summary>
536536
/// Returns value associated with <paramref name="key"/>, or <paramref name="defaultValue"/> if key does not exists
537537
/// in <paramref name="dictionary"/>

‎Main/src/Collections/Dictionary/DictionaryExtensions.GetValueOrDefault.tt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ foreach (var type in types) {#>
4040
}
4141
<#+
4242
private void Header1(string type) {#>
43-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
43+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
4444
/// <summary>
4545
/// Returns value associated with <paramref name="key"/>, or default(TValue) if key does not exists in
4646
/// <paramref name="dictionary"/>
@@ -71,7 +71,7 @@ private void ConflictBody1() {#>
7171

7272
<#+
7373
private void Header2(string type) {#>
74-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
74+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
7575
/// <summary>
7676
/// Returns value associated with <paramref name="key"/>, or <paramref name="defaultValue"/> if key does not exists
7777
/// in <paramref name="dictionary"/>

‎Main/src/Collections/Enumerable/EnumerableExtensions.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static IEnumerable<T> ConcatCore<T>(IEnumerable<T> source, T[] elements)
6969
yield return element;
7070
}
7171

72-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
72+
#if TARGETS_NET || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
7373
/// <summary>
7474
/// Prepends specified <paramref name="element"/> to the collection start.
7575
/// </summary>
@@ -116,7 +116,7 @@ private static IEnumerable<T> PrependCore<T>(IEnumerable<T> source, T[] elements
116116
yield return item;
117117
}
118118

119-
#if !TARGETS_NETCORE || LESSTHAN_NETCORE20
119+
#if LESSTHAN_NET472 || LESSTHAN_NETCORE20 || TARGETS_NETSTANDARD
120120
/// <summary>
121121
/// Creates a <see cref="HashSet{T}"/> from an <see cref="IEnumerable{T}"/>.
122122
/// </summary>
@@ -144,7 +144,6 @@ public static HashSet<T> ToHashSet<T>(
144144
[NotNull] IEqualityComparer<T> comparer) =>
145145
new HashSet<T>(source, comparer);
146146
#endif
147-
148147
/// <summary>
149148
/// Creates a <see cref="HashSet{T}"/> from an <see cref="IEnumerable{T}"/>.
150149
/// </summary>

‎Main/src/Reflection/ReflectionExtensions.CreateInstance.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using System.Reflection;
45

‎Main/tests/CodeJam.Main-Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CodeJam</RootNamespace>
99
<ProjectGuid>{DD65E3F2-9658-4242-A8AA-056028473CB1}</ProjectGuid>
1010
<OutputType>Library</OutputType>
11-
<TargetFrameworks>net461;netcoreapp2.0;net45;net40;net35</TargetFrameworks>
11+
<TargetFrameworks>net461;netcoreapp2.0;net472;net45;net40;net35</TargetFrameworks>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition=" '$(Configuration)' != 'Publish' ">

0 commit comments

Comments
 (0)