From 22a457855f6855fb1ac6aae1ac57778a0016d458 Mon Sep 17 00:00:00 2001 From: Alexander Larsen Date: Fri, 19 Apr 2024 15:52:35 +0200 Subject: [PATCH] target dotnet 8 --- Directory.Build.props | 8 ++++---- Package.UnitTests/PackageDefTests.cs | 4 ++-- Shared/tap.runtimeconfig.json | 2 +- package.xml | 12 ++++++++---- sdk/Examples/Directory.Build.props | 2 +- .../PluginDevelopment.Gui.csproj | 2 +- sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj | 2 +- sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt | 4 ++-- templates/src/project/ProjectName.csproj | 4 ++-- tests/NoAssemblyInfo.TapPlan | 2 +- tests/package-create-error.TapPlan | 4 ++-- 11 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6e9165042..7bd03977f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,20 +3,20 @@ false false false - 8 + 10 Debug;Release DEBUG;TRACE true false - net6.0 - netstandard2.0 + net8 + net8 - net472 + net8 diff --git a/Package.UnitTests/PackageDefTests.cs b/Package.UnitTests/PackageDefTests.cs index af12330fa..3d0c43ee6 100644 --- a/Package.UnitTests/PackageDefTests.cs +++ b/Package.UnitTests/PackageDefTests.cs @@ -252,7 +252,7 @@ public void CreatePackage_NoBinFiles() File.Delete(outputFilename); } } -#if NET6_0 + [Test] public void CreatePackageVersioningMono() { @@ -277,7 +277,7 @@ public void CreatePackageVersioningMono() Assert.AreEqual("0.1.2", FileVersionInfo.GetVersionInfo(tmpFile).ProductVersion, "GetVersionInfo().ProductVersion"); Assert.AreEqual("0.1.2", FileSystemHelper.GetAssemblyVersion(tmpFile), "FileSystemHelper.GetAssemblyVersion"); } -#endif + [Test] public void CreatePackageDepVersions() { diff --git a/Shared/tap.runtimeconfig.json b/Shared/tap.runtimeconfig.json index 3b861f02f..1a527b585 100644 --- a/Shared/tap.runtimeconfig.json +++ b/Shared/tap.runtimeconfig.json @@ -2,7 +2,7 @@ "runtimeOptions": { "framework": { "name": "Microsoft.NETCore.App", - "version": "6.0.0" + "version": "8.0.0" }, "applyPatches": true, diff --git a/package.xml b/package.xml index bda0bfd5c..e35fbfed0 100644 --- a/package.xml +++ b/package.xml @@ -17,8 +17,8 @@ OpenTAP - - + + @@ -41,8 +41,8 @@ - - + + @@ -68,7 +68,11 @@ + + + + diff --git a/sdk/Examples/Directory.Build.props b/sdk/Examples/Directory.Build.props index 689293a5b..e09c83954 100644 --- a/sdk/Examples/Directory.Build.props +++ b/sdk/Examples/Directory.Build.props @@ -14,7 +14,7 @@ $(GitVersion) - netstandard2.0 + net8 false false false diff --git a/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj b/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj index e2f753bb3..5baaf00b5 100644 --- a/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj +++ b/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj @@ -6,7 +6,7 @@ package.xml - net472 + net8 Debug;Release;Debug CE AnyCPU diff --git a/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj b/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj index 36657bd25..69a590063 100644 --- a/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj +++ b/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj @@ -4,7 +4,7 @@ Keysight.OpenTap.Sdk.MSBuild false true - netstandard2.0 + net8 diff --git a/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt b/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt index 83c486ca5..b7db73b6d 100644 --- a/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt +++ b/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt @@ -2,7 +2,7 @@ - netstandard2.0 + net8 @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/templates/src/project/ProjectName.csproj b/templates/src/project/ProjectName.csproj index e4fdb7fff..c77373914 100644 --- a/templates/src/project/ProjectName.csproj +++ b/templates/src/project/ProjectName.csproj @@ -6,7 +6,7 @@ true - netstandard2.0 + net8 TapEditor @@ -28,7 +28,7 @@ To ensure maximum compatibility, we recommend targetting netstandard2.0 in release builds, unless you need specific APIs that are not available in netstandard2.0. --> - net472 + net8 diff --git a/tests/NoAssemblyInfo.TapPlan b/tests/NoAssemblyInfo.TapPlan index 58ac94a02..625408ff8 100644 --- a/tests/NoAssemblyInfo.TapPlan +++ b/tests/NoAssemblyInfo.TapPlan @@ -20,7 +20,7 @@ <PropertyGroup> <TargetFrameworkIdentifier></TargetFrameworkIdentifier> <TargetFrameworkVersion></TargetFrameworkVersion> - <TargetFramework>netstandard2.0</TargetFramework> + <TargetFramework>net8</TargetFramework> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <OutputPath>bin/Debug</OutputPath> diff --git a/tests/package-create-error.TapPlan b/tests/package-create-error.TapPlan index 1984098ff..9836e58c8 100644 --- a/tests/package-create-error.TapPlan +++ b/tests/package-create-error.TapPlan @@ -13,7 +13,7 @@ <PropertyGroup> <TargetFrameworkIdentifier></TargetFrameworkIdentifier> <TargetFrameworkVersion></TargetFrameworkVersion> - <TargetFramework>netstandard2.0</TargetFramework> + <TargetFramework>net8</TargetFramework> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <OutputPath>bin/Debug</OutputPath> @@ -244,4 +244,4 @@ Inherit - \ No newline at end of file +