From 4159a46cdd3c2d524ae7aab9417f2991afeeed08 Mon Sep 17 00:00:00 2001 From: davidrpalmer <57503434+davidrpalmer@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:30:20 +0100 Subject: [PATCH 1/2] Update .NET framework version and csproj format. Change main project to .NET Standard 2.0 Upgrade test project to .NET Framework 4.8 Add NUnit3TestAdapter since the plugin for running tests in Visual Studio is not supported in VS 2022. Migrate nuspec to csproj. --- .../AbsoluteTimer.Tests.csproj | 28 +++++--- AbsoluteTimer.Tests/packages.config | 3 +- AbsoluteTimer.nuspec | 22 ------ AbsoluteTimer.sln | 19 ++--- AbsoluteTimer/AbsoluteTimer.csproj | 69 +++++-------------- AbsoluteTimer/Properties/AssemblyInfo.cs | 15 ---- 6 files changed, 50 insertions(+), 106 deletions(-) delete mode 100644 AbsoluteTimer.nuspec delete mode 100644 AbsoluteTimer/Properties/AssemblyInfo.cs diff --git a/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj b/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj index 3fb60f8..9247cbe 100644 --- a/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj +++ b/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj @@ -1,5 +1,7 @@  + + Debug @@ -9,9 +11,11 @@ Properties AbsoluteTimer.Tests AbsoluteTimer.Tests - v4.0 + v4.8 512 + + true @@ -21,6 +25,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,11 +34,11 @@ TRACE prompt 4 + false - - ..\packages\NUnit.3.0.1\lib\net40\nunit.framework.dll - True + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll @@ -43,16 +48,23 @@ + + + - {d24dbbd7-a088-4eea-9a42-f5755a7bd5a8} + {34bcfb1a-8691-403b-8627-a85a2a884831} AbsoluteTimer - - - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + - \ No newline at end of file + + diff --git a/AbsoluteTimer/Properties/AssemblyInfo.cs b/AbsoluteTimer/Properties/AssemblyInfo.cs deleted file mode 100644 index 99300cf..0000000 --- a/AbsoluteTimer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("AbsoluteTimer")] -[assembly: AssemblyCompany("Jiri {x2} Cincura")] -[assembly: AssemblyProduct("AbsoluteTimer")] -[assembly: AssemblyCopyright("Copyright (c) Jiri {x2} Cincura")] - -[assembly: ComVisible(false)] - -[assembly: Guid("ED894EAD-363E-4B2A-986D-50ABE8A78141")] - -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] -[assembly: AssemblyInformationalVersion("1.0.1")] \ No newline at end of file From c277f46e1ffee42741934ef69b068960317521cc Mon Sep 17 00:00:00 2001 From: davidrpalmer <57503434+davidrpalmer@users.noreply.github.com> Date: Sat, 29 Apr 2023 17:04:05 +0100 Subject: [PATCH 2/2] Update unit test csproj to match main the project. (new csproj format and .net 6) --- .../AbsoluteTimer.Tests.csproj | 83 ++++--------------- AbsoluteTimer.Tests/packages.config | 5 -- 2 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 AbsoluteTimer.Tests/packages.config diff --git a/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj b/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj index 9247cbe..0ccb47a 100644 --- a/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj +++ b/AbsoluteTimer.Tests/AbsoluteTimer.Tests.csproj @@ -1,75 +1,20 @@ - - - - - + + - Debug - AnyCPU - {C68D3ED7-1529-4684-9AD6-3AB15579A84E} - Library - Properties - AbsoluteTimer.Tests - AbsoluteTimer.Tests - v4.8 - 512 - - - + net6.0 + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll - - - - - - - - - + - + + + + + + - - {34bcfb1a-8691-403b-8627-a85a2a884831} - AbsoluteTimer - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file + + diff --git a/AbsoluteTimer.Tests/packages.config b/AbsoluteTimer.Tests/packages.config deleted file mode 100644 index 8843290..0000000 --- a/AbsoluteTimer.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file