Skip to content

Commit d784050

Browse files
atifazizatifaziz
authored
Set .NET Standard 2.0 as the baseline target
1 parent 190263e commit d784050

File tree

14 files changed

+14
-1510
lines changed

14 files changed

+14
-1510
lines changed

‎MoreLinq.Test/MoreLinq.Test.csproj

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>MoreLinq.Test</AssemblyTitle>
5-
<TargetFrameworks>net7.0;net6.0;net462</TargetFrameworks>
5+
<TargetFrameworks>net7.0;net6.0;net471</TargetFrameworks>
66
<DebugType>portable</DebugType>
77
<AssemblyName>MoreLinq.Test</AssemblyName>
8-
<OutputType Condition="'$(TargetFramework)' == 'net462'">Exe</OutputType>
8+
<OutputType Condition="'$(TargetFramework)' == 'net471'">Exe</OutputType>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
<IsPackable>false</IsPackable>
1111
<ApplicationIcon />
@@ -46,12 +46,12 @@
4646
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
4747
</ItemGroup>
4848

49-
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
49+
<ItemGroup Condition="'$(TargetFramework)' != 'net471'">
5050
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
5151
<Compile Remove="Program.cs" />
5252
</ItemGroup>
5353

54-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
54+
<ItemGroup Condition="'$(TargetFramework)' == 'net471'">
5555
<Compile Remove="Async\*.cs" />
5656
</ItemGroup>
5757

@@ -63,16 +63,6 @@
6363
<Compile Include="..\MoreLinq\Reactive\Subject.cs" Link="Subject.cs" />
6464
</ItemGroup>
6565

66-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
67-
<Reference Include="System" />
68-
<Reference Include="System.Data.DataSetExtensions" />
69-
<Reference Include="System.Data" />
70-
<Reference Include="System.Runtime" />
71-
<Reference Include="System.Xml" />
72-
<Reference Include="System.Xml.Linq" />
73-
<Reference Include="Microsoft.CSharp" />
74-
</ItemGroup>
75-
7666
<ItemGroup>
7767
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
7868
</ItemGroup>

‎MoreLinq/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@
3636
// CLS compliance and COM visibility
3737

3838
[assembly: CLSCompliant(true)]
39-
#if !NO_COM
4039
[assembly: System.Runtime.InteropServices.ComVisible(false)]
4140

4241
// ID of the typelib if this project is exposed to COM.
4342

4443
[assembly: System.Runtime.InteropServices.Guid("fc632c9d-390e-4902-8c1c-3e57b08c1d38")]
45-
#endif

‎MoreLinq/CompatibilitySuppressions.xml

Lines changed: 2 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -2,129 +2,7 @@
22
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
44
<Suppression>
5-
<DiagnosticId>CP0001</DiagnosticId>
6-
<Target>T:MoreLinq.Experimental.AwaitQueryOptions</Target>
7-
<Left>lib/net451/MoreLinq.dll</Left>
8-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
9-
<IsBaselineSuppression>true</IsBaselineSuppression>
10-
</Suppression>
11-
<Suppression>
12-
<DiagnosticId>CP0001</DiagnosticId>
13-
<Target>T:MoreLinq.Experimental.IAwaitQuery`1</Target>
14-
<Left>lib/net451/MoreLinq.dll</Left>
15-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
16-
<IsBaselineSuppression>true</IsBaselineSuppression>
17-
</Suppression>
18-
<Suppression>
19-
<DiagnosticId>CP0001</DiagnosticId>
20-
<Target>T:MoreLinq.Extensions.ToDataTableExtension</Target>
21-
<Left>lib/net451/MoreLinq.dll</Left>
22-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
23-
<IsBaselineSuppression>true</IsBaselineSuppression>
24-
</Suppression>
25-
<Suppression>
26-
<DiagnosticId>CP0002</DiagnosticId>
27-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.AsOrdered``1(MoreLinq.Experimental.IAwaitQuery{``0})</Target>
28-
<Left>lib/net451/MoreLinq.dll</Left>
29-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
30-
<IsBaselineSuppression>true</IsBaselineSuppression>
31-
</Suppression>
32-
<Suppression>
33-
<DiagnosticId>CP0002</DiagnosticId>
34-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.AsSequential``1(MoreLinq.Experimental.IAwaitQuery{``0})</Target>
35-
<Left>lib/net451/MoreLinq.dll</Left>
36-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
37-
<IsBaselineSuppression>true</IsBaselineSuppression>
38-
</Suppression>
39-
<Suppression>
40-
<DiagnosticId>CP0002</DiagnosticId>
41-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.AsUnordered``1(MoreLinq.Experimental.IAwaitQuery{``0})</Target>
42-
<Left>lib/net451/MoreLinq.dll</Left>
43-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
44-
<IsBaselineSuppression>true</IsBaselineSuppression>
45-
</Suppression>
46-
<Suppression>
47-
<DiagnosticId>CP0002</DiagnosticId>
48-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.Await``1(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task{``0}})</Target>
49-
<Left>lib/net451/MoreLinq.dll</Left>
50-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
51-
<IsBaselineSuppression>true</IsBaselineSuppression>
52-
</Suppression>
53-
<Suppression>
54-
<DiagnosticId>CP0002</DiagnosticId>
55-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.Await``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,System.Threading.CancellationToken,System.Threading.Tasks.Task{``1}})</Target>
56-
<Left>lib/net451/MoreLinq.dll</Left>
57-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
58-
<IsBaselineSuppression>true</IsBaselineSuppression>
59-
</Suppression>
60-
<Suppression>
61-
<DiagnosticId>CP0002</DiagnosticId>
62-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.AwaitCompletion``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,System.Threading.CancellationToken,System.Threading.Tasks.Task{``1}},System.Func{``0,System.Threading.Tasks.Task{``1},``2})</Target>
63-
<Left>lib/net451/MoreLinq.dll</Left>
64-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
65-
<IsBaselineSuppression>true</IsBaselineSuppression>
66-
</Suppression>
67-
<Suppression>
68-
<DiagnosticId>CP0002</DiagnosticId>
69-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.MaxConcurrency``1(MoreLinq.Experimental.IAwaitQuery{``0},System.Int32)</Target>
70-
<Left>lib/net451/MoreLinq.dll</Left>
71-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
72-
<IsBaselineSuppression>true</IsBaselineSuppression>
73-
</Suppression>
74-
<Suppression>
75-
<DiagnosticId>CP0002</DiagnosticId>
76-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.PreserveOrder``1(MoreLinq.Experimental.IAwaitQuery{``0},System.Boolean)</Target>
77-
<Left>lib/net451/MoreLinq.dll</Left>
78-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
79-
<IsBaselineSuppression>true</IsBaselineSuppression>
80-
</Suppression>
81-
<Suppression>
82-
<DiagnosticId>CP0002</DiagnosticId>
83-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.Scheduler``1(MoreLinq.Experimental.IAwaitQuery{``0},System.Threading.Tasks.TaskScheduler)</Target>
84-
<Left>lib/net451/MoreLinq.dll</Left>
85-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
86-
<IsBaselineSuppression>true</IsBaselineSuppression>
87-
</Suppression>
88-
<Suppression>
89-
<DiagnosticId>CP0002</DiagnosticId>
90-
<Target>M:MoreLinq.Experimental.ExperimentalEnumerable.UnboundedConcurrency``1(MoreLinq.Experimental.IAwaitQuery{``0})</Target>
91-
<Left>lib/net451/MoreLinq.dll</Left>
92-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
93-
<IsBaselineSuppression>true</IsBaselineSuppression>
94-
</Suppression>
95-
<Suppression>
96-
<DiagnosticId>CP0002</DiagnosticId>
97-
<Target>M:MoreLinq.MoreEnumerable.ToDataTable``1(System.Collections.Generic.IEnumerable{``0},System.Linq.Expressions.Expression{System.Func{``0,System.Object}}[])</Target>
98-
<Left>lib/net451/MoreLinq.dll</Left>
99-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
100-
<IsBaselineSuppression>true</IsBaselineSuppression>
101-
</Suppression>
102-
<Suppression>
103-
<DiagnosticId>CP0002</DiagnosticId>
104-
<Target>M:MoreLinq.MoreEnumerable.ToDataTable``1(System.Collections.Generic.IEnumerable{``0})</Target>
105-
<Left>lib/net451/MoreLinq.dll</Left>
106-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
107-
<IsBaselineSuppression>true</IsBaselineSuppression>
108-
</Suppression>
109-
<Suppression>
110-
<DiagnosticId>CP0002</DiagnosticId>
111-
<Target>M:MoreLinq.MoreEnumerable.ToDataTable``2(System.Collections.Generic.IEnumerable{``0},``1,System.Linq.Expressions.Expression{System.Func{``0,System.Object}}[])</Target>
112-
<Left>lib/net451/MoreLinq.dll</Left>
113-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
114-
<IsBaselineSuppression>true</IsBaselineSuppression>
115-
</Suppression>
116-
<Suppression>
117-
<DiagnosticId>CP0002</DiagnosticId>
118-
<Target>M:MoreLinq.MoreEnumerable.ToDataTable``2(System.Collections.Generic.IEnumerable{``0},``1)</Target>
119-
<Left>lib/net451/MoreLinq.dll</Left>
120-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
121-
<IsBaselineSuppression>true</IsBaselineSuppression>
122-
</Suppression>
123-
<Suppression>
124-
<DiagnosticId>CP0002</DiagnosticId>
125-
<Target>M:MoreLinq.SequenceException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
126-
<Left>lib/net451/MoreLinq.dll</Left>
127-
<Right>lib/netstandard1.0/MoreLinq.dll</Right>
128-
<IsBaselineSuppression>true</IsBaselineSuppression>
5+
<DiagnosticId>PKV006</DiagnosticId>
6+
<Target>.NETStandard,Version=v1.0</Target>
1297
</Suppression>
1308
</Suppressions>

‎MoreLinq/Experimental/Await.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
// limitations under the License.
1616
#endregion
1717

18-
#if !NO_ASYNC
19-
2018
namespace MoreLinq.Experimental
2119
{
2220
using System;
@@ -789,4 +787,3 @@ public void Exit() =>
789787
}
790788
}
791789

792-
#endif // !NO_ASYNC

‎MoreLinq/GroupAdjacent.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,7 @@ public static Grouping<TKey, TElement> Create<TKey, TElement>(TKey key, IEnumera
304304
new(key, members);
305305
}
306306

307-
#if !NO_SERIALIZATION_ATTRIBUTES
308307
[Serializable]
309-
#endif
310308
sealed class Grouping<TKey, TElement> : IGrouping<TKey, TElement>
311309
{
312310
readonly IEnumerable<TElement> _members;

‎MoreLinq/MoreLinq.csproj

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<NeutralLanguage>en-US</NeutralLanguage>
121121
<VersionPrefix>4.0.0</VersionPrefix>
122122
<Authors>MoreLINQ Developers.</Authors>
123-
<TargetFrameworks>net462;netstandard1.0;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
123+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
124124
<DebugType>portable</DebugType>
125125
<GenerateDocumentationFile>true</GenerateDocumentationFile>
126126
<AssemblyName>MoreLinq</AssemblyName>
@@ -190,34 +190,14 @@
190190
</None>
191191
</ItemGroup>
192192

193-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
194-
<Reference Include="System.Data.DataSetExtensions" />
195-
<Reference Include="System.Data" />
196-
<Reference Include="System.Xml" />
197-
<Reference Include="System" />
198-
</ItemGroup>
199-
200193
<PropertyGroup>
201194
<DefineConstants>$(DefineConstants);MORELINQ</DefineConstants>
202195
</PropertyGroup>
203196

204-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
197+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
205198
<DefineConstants>$(DefineConstants);NO_ASYNC_STREAMS;NO_BUFFERS</DefineConstants>
206199
</PropertyGroup>
207200

208-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
209-
<DefineConstants>$(DefineConstants);NO_ASYNC_STREAMS;NO_BUFFERS;NO_SERIALIZATION_ATTRIBUTES;NO_EXCEPTION_SERIALIZATION;NO_TRACING;NO_COM;NO_ASYNC</DefineConstants>
210-
</PropertyGroup>
211-
212-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
213-
<Compile Remove="ToDataTable.cs" />
214-
<Compile Remove="Extensions.ToDataTable.g.cs" />
215-
</ItemGroup>
216-
217-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' Or '$(TargetFramework)' == 'net462'">
218-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
219-
</ItemGroup>
220-
221201
<ItemGroup>
222202
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
223203
</ItemGroup>

0 commit comments

Comments
 (0)