Skip to content

Commit 1a4b5e7

Browse files
committed
Remove assembly timeout attributes and feature
1 parent 4a78dfb commit 1a4b5e7

22 files changed

Lines changed: 0 additions & 238 deletions

File tree

Directory.Build.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@
147147

148148
<DefineConstants>$(DefineConstants);FEATURE_ICONFIGURATIONROOT_PROVIDERS</DefineConstants>
149149

150-
<!-- NUnit's TimeoutAttribute does not work on modern .NET, and now errors at runtime.
151-
See docs here: https://docs.nunit.org/articles/nunit/writing-tests/attributes/timeout.html -->
152-
<DefineConstants>$(DefineConstants);FEATURE_NUNIT_TIMEOUTATTRIBUTE</DefineConstants>
153-
154150
</PropertyGroup>
155151

156152
<!-- Features in .NET Framework 4.5+ -->

src/Lucene.Net.Tests.Analysis.Common/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*
2020
*/
2121

22-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
23-
using NUnit.Framework;
24-
#endif
2522
using System.Reflection;
2623
using System.Runtime.InteropServices;
2724

@@ -37,12 +34,3 @@
3734

3835
// The following GUID is for the ID of the typelib if this project is exposed to COM
3936
[assembly: Guid("fd602350-abed-4d1e-ad7b-709d18b0b464")]
40-
41-
42-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
43-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
44-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
45-
#pragma warning disable CS0618 // Type or member is obsolete
46-
[assembly: Timeout(3300000)]
47-
#pragma warning restore CS0618 // Type or member is obsolete
48-
#endif

src/Lucene.Net.Tests.Analysis.Kuromoji/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
19-
using NUnit.Framework;
20-
#endif
2118
using System.Reflection;
2219
using System.Runtime.InteropServices;
2320

@@ -33,11 +30,3 @@
3330

3431
// The following GUID is for the ID of the typelib if this project is exposed to COM
3532
[assembly: Guid("34a2bce8-1351-43bd-a365-f50e7c0b2c49")]
36-
37-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
38-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
39-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
40-
#pragma warning disable CS0618 // Type or member is obsolete
41-
[assembly: Timeout(3300000)]
42-
#pragma warning restore CS0618 // Type or member is obsolete
43-
#endif

src/Lucene.Net.Tests.Analysis.Phonetic/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*
2020
*/
2121

22-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
23-
using NUnit.Framework;
24-
#endif
2522
using System.Reflection;
2623
using System.Runtime.InteropServices;
2724

@@ -37,11 +34,3 @@
3734

3835
// The following GUID is for the ID of the typelib if this project is exposed to COM
3936
[assembly: Guid("a2867797-0a5d-4878-8f59-58c399c9a4e4")]
40-
41-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
42-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
43-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
44-
#pragma warning disable CS0618 // Type or member is obsolete
45-
[assembly: Timeout(3300000)]
46-
#pragma warning restore CS0618 // Type or member is obsolete
47-
#endif

src/Lucene.Net.Tests.Analysis.SmartCn/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
19-
using NUnit.Framework;
20-
#endif
2118
using System.Reflection;
2219
using System.Runtime.InteropServices;
2320

@@ -33,11 +30,3 @@
3330

3431
// The following GUID is for the ID of the typelib if this project is exposed to COM
3532
[assembly: Guid("8c8d78d3-bffd-4301-953b-fe5350b2aeeb")]
36-
37-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
38-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
39-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
40-
#pragma warning disable CS0618 // Type or member is obsolete
41-
[assembly: Timeout(3300000)]
42-
#pragma warning restore CS0618 // Type or member is obsolete
43-
#endif

src/Lucene.Net.Tests.Analysis.Stempel/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*
2020
*/
2121

22-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
23-
using NUnit.Framework;
24-
#endif
2522
using System.Reflection;
2623
using System.Runtime.InteropServices;
2724

@@ -37,11 +34,3 @@
3734

3835
// The following GUID is for the ID of the typelib if this project is exposed to COM
3936
[assembly: Guid("940a6ab1-f00a-40e2-bc1a-2898efa8c48f")]
40-
41-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
42-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
43-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
44-
#pragma warning disable CS0618 // Type or member is obsolete
45-
[assembly: Timeout(3300000)]
46-
#pragma warning restore CS0618 // Type or member is obsolete
47-
#endif

src/Lucene.Net.Tests.Benchmark/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
19-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
20-
using NUnit.Framework;
21-
#endif
2218
using System.Reflection;
2319
using System.Runtime.InteropServices;
2420

@@ -34,11 +30,3 @@
3430

3531
// The following GUID is for the ID of the typelib if this project is exposed to COM
3632
[assembly: Guid("9257f543-44e2-4db6-8b27-a8a354c13e5b")]
37-
38-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
39-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
40-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
41-
#pragma warning disable CS0618 // Type or member is obsolete
42-
[assembly: Timeout(3300000)]
43-
#pragma warning restore CS0618 // Type or member is obsolete
44-
#endif

src/Lucene.Net.Tests.Classification/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*
2020
*/
2121

22-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
23-
using NUnit.Framework;
24-
#endif
2522
using System.Reflection;
2623
using System.Runtime.InteropServices;
2724

@@ -37,11 +34,3 @@
3734

3835
// The following GUID is for the ID of the typelib if this project is exposed to COM
3936
[assembly: Guid("253246a8-7b09-4251-ab4c-7971d3b2be4a")]
40-
41-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
42-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
43-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
44-
#pragma warning disable CS0618 // Type or member is obsolete
45-
[assembly: Timeout(3300000)]
46-
#pragma warning restore CS0618 // Type or member is obsolete
47-
#endif

src/Lucene.Net.Tests.Codecs/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,3 @@
3939
// LUCENENET specific - only allow tests in this assembly to run one at a time
4040
// to prevent polluting shared state.
4141
[assembly: LevelOfParallelism(1)]
42-
43-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
44-
// LUCENENET specific - time out this test project at 50 minutes to allow for time before this
45-
// test runs and the results to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
46-
#pragma warning disable CS0618 // Type or member is obsolete
47-
[assembly: Timeout(3000000)]
48-
#pragma warning restore CS0618 // Type or member is obsolete
49-
#endif

src/Lucene.Net.Tests.Expressions/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*
2020
*/
2121

22-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
23-
using NUnit.Framework;
24-
#endif
2522
using System.Reflection;
2623
using System.Runtime.InteropServices;
2724

@@ -37,11 +34,3 @@
3734

3835
// The following GUID is for the ID of the typelib if this project is exposed to COM
3936
[assembly: Guid("0c789606-781d-47dc-b391-5ac367fce258")]
40-
41-
#if FEATURE_NUNIT_TIMEOUTATTRIBUTE
42-
// LUCENENET specific - time out test projects at 55 minutes to allow the results
43-
// to be uploaded before the 60 minute Azure DevOps job cutoff for easier troubleshooting
44-
#pragma warning disable CS0618 // Type or member is obsolete
45-
[assembly: Timeout(3300000)]
46-
#pragma warning restore CS0618 // Type or member is obsolete
47-
#endif

0 commit comments

Comments
 (0)