Skip to content

Commit cd35836

Browse files
andrewvkandrewvk
authored
Remove old targets
Co-authored-by: Andrew Koryavchenko <avk@rsdn.ru>
1 parent 8b36b7e commit cd35836

20 files changed

Lines changed: 25 additions & 283 deletions

‎Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir "$env:APPVEYOR_BUILD_FOLDER\_Results" -ErrorAction SilentlyContinue
55
$wc = New-Object System.Net.WebClient
66

77
#run .net tests
8-
$targetsDotNet = "net48;net472;net471;net47;net461;net45;net40;net35;net20" -split ";"
8+
$targetsDotNet = "net48;net472;net471;net47;net461;net45;net40;net35" -split ";"
99
foreach ($target in $targetsDotNet) {
1010
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml"
1111
$testAssemblies = (Get-ChildItem -include $include -r | `
@@ -27,7 +27,7 @@ foreach ($target in $targetsDotNet) {
2727
}
2828

2929
#run .net core tests
30-
$targetsDotNetCore = "net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp1.1" -split ";"
30+
$targetsDotNetCore = "net5.0;netcoreapp3.1" -split ";"
3131
foreach ($target in $targetsDotNetCore) {
3232
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml"
3333
$testAssemblies = (Get-ChildItem -include $include -r | `

‎Build/Props/CodeJam.Default.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<DelaySign>False</DelaySign>
88
<AssemblyOriginatorKeyFile>..\Build\CodeJam.snk</AssemblyOriginatorKeyFile>
99

10-
<Version>3.3.0.0</Version>
11-
<PackageVersion>3.3.0</PackageVersion>
10+
<Version>4.0.0.0</Version>
11+
<PackageVersion>4.0.0-beta1</PackageVersion>
1212
<PackageOutputPath>..\_Results</PackageOutputPath>
1313

1414
<Company>RSDN</Company>

‎Build/Props/CodeJam.Targeting.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<!-- VS does select the first moniker in list as default target
2222
therefore we place our default platform (netcoreapp3.0) at start of the list -->
2323
<PropertyGroup>
24-
<CopyMeTargetFrameworks>netcoreapp3.0;net5.0;netcoreapp2.0;netcoreapp1.0;netstandard2.1;netstandard2.0;netstandard1.5;netstandard1.3;net472;net461;net45;net40;net35;net20</CopyMeTargetFrameworks>
25-
<CopyMeTestTargetFrameworks>netcoreapp3.0;net5.0;netcoreapp2.1;netcoreapp1.1;net472;net461;net45;net40;net35;net20</CopyMeTestTargetFrameworks>
26-
<CopyMeMinimalTargetFrameworks>netcoreapp3.0;netstandard2.0;net461</CopyMeMinimalTargetFrameworks>
27-
<CopyMeMinimalTestTargetFrameworks>netcoreapp3.0;netcoreapp2.1;net461</CopyMeMinimalTestTargetFrameworks>
24+
<CopyMeTargetFrameworks>netcoreapp3.1;net5.0;netstandard2.1;netstandard2.0;net472;net461;net45;net40;net35</CopyMeTargetFrameworks>
25+
<CopyMeTestTargetFrameworks>netcoreapp3.1;net5.0;net472;net461;net45;net40;net35</CopyMeTestTargetFrameworks>
26+
<CopyMeMinimalTargetFrameworks>netcoreapp3.1;netstandard2.0;net461</CopyMeMinimalTargetFrameworks>
27+
<CopyMeMinimalTestTargetFrameworks>netcoreapp3.1;net461</CopyMeMinimalTestTargetFrameworks>
2828
</PropertyGroup>
2929

3030
<!-- Monikers for .Net Framework -->

‎CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj‎

Lines changed: 1 addition & 15 deletions
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>net5.0;net48;net472;net471;net47;net461;net45;net40;net35;net20;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp1.1</TargetFrameworks>
11+
<TargetFrameworks>net5.0;net48;net472;net471;net47;net461;net45;net40;net35;netcoreapp3.1</TargetFrameworks>
1212
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
1313
</PropertyGroup>
1414

@@ -21,20 +21,6 @@
2121
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
2323
</ItemGroup>
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net20' ">
25-
<!-- NUnit v3.11 is the last version supporting .NET 2.0 -->
26-
<PackageReference Include="NUnit" Version="[3.11.0]" />
27-
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1]" />
28-
<!-- Microsoft.NET.Test.Sdk v16.2 is the last version supporting .NET Core 2.0 -->
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[16.2.0]" />
30-
</ItemGroup>
31-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
32-
<!-- NUnit v3.9 is the last version supporting .NET Core 1.0 -->
33-
<PackageReference Include="NUnit" Version="[3.9.0]" />
34-
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1]" />
35-
<!-- Microsoft.NET.Test.Sdk v16.2 is the last version supporting .NET Core 1.1 -->
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[16.2.0]" />
37-
</ItemGroup>
3824
<!-- #endregion -->
3925

4026
<ItemGroup>

‎CodeJam.Blocks.Tests/TableData/TableDataTest.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if LESSTHAN_NET35
2-
extern alias nunitlinq;
3-
#endif
4-
5-
using System;
1+
using System;
62
using System.IO;
73
using System.Linq;
84

‎CodeJam.Blocks/CodeJam.Blocks.csproj‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<RootNamespace>CodeJam</RootNamespace>
1010
<ProjectGuid>{0DFF0859-2400-4487-83AD-0ED10203D6D9}</ProjectGuid>
1111
<OutputType>Library</OutputType>
12-
<TargetFrameworks>net5.0;net472;net461;net45;net40;net35;net20;netstandard2.1;netstandard2.0;netstandard1.5;netstandard1.3;netcoreapp3.0;netcoreapp2.0;netcoreapp1.0</TargetFrameworks>
12+
<TargetFrameworks>net5.0;net472;net461;net45;net40;net35;netstandard2.1;netstandard2.0;netcoreapp3.1</TargetFrameworks>
1313
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
1414

1515
<PackageId>CodeJam.Blocks</PackageId>
@@ -33,16 +33,6 @@
3333
<_Parameter1>.NETFramework,Version=v3.5</_Parameter1>
3434
</AssemblyAttribute>
3535
</ItemGroup>
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net30'">
37-
<AssemblyAttribute Include="System.Runtime.Versioning.TargetFrameworkAttribute">
38-
<_Parameter1>.NETFramework,Version=v3.0</_Parameter1>
39-
</AssemblyAttribute>
40-
</ItemGroup>
41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net20'">
42-
<AssemblyAttribute Include="System.Runtime.Versioning.TargetFrameworkAttribute">
43-
<_Parameter1>.NETFramework,Version=v2.0</_Parameter1>
44-
</AssemblyAttribute>
45-
</ItemGroup>
4636

4737
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
4838
<PackageReference Include="System.Data.Common" Version="4.3.0" />
@@ -52,18 +42,6 @@
5242
<PackageReference Include="System.Data.Common" Version="4.3.0" />
5343
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
5444
</ItemGroup>
55-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
56-
<PackageReference Include="System.Data.Common" Version="4.3.0" />
57-
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
58-
</ItemGroup>
59-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
60-
<PackageReference Include="System.Data.Common" Version="4.3.0" />
61-
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
62-
</ItemGroup>
63-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
64-
<PackageReference Include="System.Data.Common" Version="4.3.0" />
65-
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
66-
</ItemGroup>
6745
<!-- #endregion -->
6846

6947
<ItemGroup>

‎CodeJam.Main.Tests/Algorithms/MemoizeTests.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if LESSTHAN_NET35
2-
extern alias nunitlinq;
3-
#endif
4-
5-
using System;
1+
using System;
62

73
using NUnit.Framework;
84

‎CodeJam.Main.Tests/Algorithms/UpperBoundTest.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if LESSTHAN_NET35
2-
extern alias nunitlinq;
3-
#endif
4-
5-
using System;
1+
using System;
62
using System.Collections.Generic;
73
using System.Linq;
84

‎CodeJam.Main.Tests/CodeJam.Main.Tests.csproj‎

Lines changed: 1 addition & 16 deletions
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>net5.0;net48;net472;net471;net47;net461;net45;net40;net35;net20;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp1.1</TargetFrameworks>
11+
<TargetFrameworks>net5.0;net48;net472;net471;net47;net461;net45;net40;net35;netcoreapp3.1</TargetFrameworks>
1212
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1313
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
1414
</PropertyGroup>
@@ -22,21 +22,6 @@
2222
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
2424
</ItemGroup>
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net20' ">
26-
<!-- NUnit v3.11 is the last version supporting .NET 2.0 -->
27-
<PackageReference Include="NUnit" Version="[3.11.0]" />
28-
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1]" />
29-
<!-- Microsoft.NET.Test.Sdk v16.2 is the last version supporting .NET Core 2.0 -->
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[16.2.0]" />
31-
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
33-
<!-- NUnit v3.9 is the last version supporting .NET Core 1.0 -->
34-
<PackageReference Include="NUnit" Version="[3.9.0]" />
35-
<PackageReference Include="NUnit3TestAdapter" Version="[3.15.1]" />
36-
<!-- Microsoft.NET.Test.Sdk v16.2 is the last version supporting .NET Core 1.1 -->
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[16.2.0]" />
38-
<PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
39-
</ItemGroup>
4025
<!-- #endregion -->
4126

4227
<ItemGroup>

‎CodeJam.Main.Tests/Collections/Enumerable/EnumerableExtensionTests.MinMaxOrDefault.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if LESSTHAN_NET35
2-
extern alias nunitlinq;
3-
#endif
4-
5-
using System.Collections.Generic;
1+
using System.Collections.Generic;
62
using System.Linq;
73

84
using JetBrains.Annotations;

0 commit comments

Comments
 (0)