diff --git a/Spring.Net.sln.DotSettings b/Spring.Net.sln.DotSettings index 0ad92593..08d4b5d9 100644 --- a/Spring.Net.sln.DotSettings +++ b/Spring.Net.sln.DotSettings @@ -64,6 +64,7 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> 1 1 + True True True True diff --git a/build-support/nuke-build/_build.csproj b/build-support/nuke-build/_build.csproj index ba9d6764..2aadd385 100644 --- a/build-support/nuke-build/_build.csproj +++ b/build-support/nuke-build/_build.csproj @@ -2,16 +2,17 @@ Exe - net6.0 + net8.0 CS0649;CS0169 ..\.. ..\.. 1 + true - + diff --git a/build.sh b/build.sh index 0aa13300..db2c0b69 100755 --- a/build.sh +++ b/build.sh @@ -58,7 +58,7 @@ fi echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)" -if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "NUKE_ENTERPRISE_TOKEN" != "" ]]; then +if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "$NUKE_ENTERPRISE_TOKEN" != "" ]]; then "$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true "$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true fi diff --git a/global.json b/global.json index a6e7dc6c..c19a2e05 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.100", "rollForward": "latestMinor" } -} \ No newline at end of file +} diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 4a85b326..15cc8d93 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -27,6 +27,8 @@ false + true + diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs index cdc628a4..5f5c61bf 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs @@ -37,6 +37,8 @@ using Spring.Util; using NUnit.Framework; +#pragma warning disable SYSLIB0050 + namespace Spring.Aop.Framework.DynamicProxy { /// diff --git a/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs b/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs index 6b7aabf2..25bf36bf 100644 --- a/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs +++ b/test/Spring/Spring.Aop.Tests/AopSerializationTests.cs @@ -32,6 +32,8 @@ using Spring.Aop.Framework; using Spring.Context; using Spring.Objects.Factory; +#pragma warning disable SYSLIB0050 + namespace Spring { /// @@ -132,4 +134,4 @@ namespace Spring } } } -} \ No newline at end of file +} diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj index 47f9d435..1b9ccbd9 100644 --- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj +++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) $(NoWarn);SYSLIB0011 @@ -17,7 +17,7 @@ - + diff --git a/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj b/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj index 85ab2797..5c2feab6 100644 --- a/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj +++ b/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net472;net6.0 + net472;net8.0 Spring.Benchmark diff --git a/test/Spring/Spring.Core.Tests/ExceptionsTest.cs b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs index aa076ce3..d6562122 100644 --- a/test/Spring/Spring.Core.Tests/ExceptionsTest.cs +++ b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,6 @@ #endregion -#region Imports - using System; using System.Globalization; using System.IO; @@ -28,7 +26,9 @@ using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; -#endregion +#pragma warning disable CS0672 // Member overrides obsolete member +#pragma warning disable SYSLIB0050 +#pragma warning disable SYSLIB0051 namespace Spring { @@ -446,4 +446,4 @@ namespace Spring } #endregion -} \ No newline at end of file +} diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj index 65d84f93..6b0c5b2d 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) $(NoWarn);SYSLIB0001;SYSLIB0003;SYSLIB0011 false true @@ -34,7 +34,7 @@ - + diff --git a/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs index 3df2b5fb..0ebd69e8 100644 --- a/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs +++ b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs @@ -18,16 +18,12 @@ #endregion -#region Imports - using System.IO; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; using Spring.Objects; -#endregion - namespace Spring.Util { /// @@ -83,7 +79,9 @@ namespace Spring.Util /// true if the object is serializable, otherwise false. public static bool IsSerializable(object o) { +#pragma warning disable SYSLIB0050 // Type or member is obsolete return o == null ? true : o.GetType().IsSerializable; +#pragma warning restore SYSLIB0050 } /// @@ -107,4 +105,4 @@ namespace Spring.Util } } -} \ No newline at end of file +} diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj index aec621b5..7905719a 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj +++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) @@ -22,7 +22,7 @@ - + diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj index 7cc16dbc..533d1096 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj index a7f9f512..ab99b6d5 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) diff --git a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs index c2a472fc..b2a0f230 100644 --- a/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs +++ b/test/Spring/Spring.Data.Tests/Dao/Attributes/PersistenceExceptionTranslationAdvisorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,6 @@ #endregion -#region Imports - using System; using System.Runtime.Serialization; using NUnit.Framework; @@ -27,7 +25,7 @@ using Spring.Aop.Framework; using Spring.Dao.Support; using Spring.Stereotype; -#endregion +#pragma warning disable SYSLIB0051 namespace Spring.Dao.Attributes { diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj index 7b40c58a..263fdc04 100644 --- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj +++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) false @@ -23,7 +23,7 @@ - + diff --git a/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs index 547565d5..d0410279 100644 --- a/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs +++ b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ #endregion -#region Imports - using System; using System.Runtime.Serialization; -#endregion +#pragma warning disable CS0672 // Member overrides obsolete member +#pragma warning disable SYSLIB0050 +#pragma warning disable SYSLIB0051 namespace Spring.Support { diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj index caf1e833..f38b1bc1 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj +++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) diff --git a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj index 508c2979..78f7e92b 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj +++ b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) diff --git a/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj b/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj index 33702e83..5fe01d6a 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj +++ b/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj index 2ce01bad..249720ba 100644 --- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj +++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj @@ -1,6 +1,6 @@  - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion) @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj index 587cfecc..3067f277 100644 --- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj +++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;$(TargetFullFrameworkVersion) + net8.0;$(TargetFullFrameworkVersion)