target dotnet 8

opentap · Apr 19, 2024 · 22a4578 · 22a4578
1 parent 1f10c70
commit 22a4578
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 21 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,20 +3,20 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
     <Configurations>Debug;Release</Configurations>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IsDebug>false</IsDebug>
-    <OpenTapAppTargetFramework>net6.0</OpenTapAppTargetFramework>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <OpenTapAppTargetFramework>net8</OpenTapAppTargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <TargetFrameworkIdentifier></TargetFrameworkIdentifier>
     <TargetFrameworkVersion></TargetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' != 'Unix'">
     <!-- .net462 revert: on windows we build -->   
-    <OpenTapAppTargetFramework>net472</OpenTapAppTargetFramework>
+    <OpenTapAppTargetFramework>net8</OpenTapAppTargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git 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
@@ -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
@@ -17,8 +17,8 @@
     <Owner>OpenTAP</Owner>
     <!-- Common files  -->
     <Files Condition="$(Debug) == false">
-        <File  Condition="$(Platform) != Windows" Path="tap.runtimeconfig.json"/>
-        <File Condition="$(Platform) != Windows" Path="tap.dll">
+        <File Path="tap.runtimeconfig.json"/>
+        <File Path="tap.dll">
             <SetAssemblyInfo Attributes="Version" />
             <Sign Certificate="Keysight Technologies, Inc" Condition="$(Sign)==true"/>
         </File>
@@ -41,8 +41,8 @@
     </Files>
     <!-- For debug builds. Includes debugging symbols and puts all the DLLs in the OpenTAP root directory.  -->
     <Files Condition="$(Debug) == true">
-        <File Condition="$(Platform) != Windows" Path="tap.runtimeconfig.json"/>
-        <File Condition="$(Platform) != Windows" Path="tap.dll"/>
+        <File Path="tap.runtimeconfig.json"/>
+        <File Path="tap.dll"/>
         <File Path="tap.pdb"/>  
         <File Path="OpenTap.dll"/>
         <File Path="OpenTap.pdb"/>
@@ -68,7 +68,11 @@
             <Sign Certificate="Keysight Technologies, Inc" Condition="$(Sign)==true"/>
         </File>
         <!-- The tap upgrader is only necessary on Windows because we cannot overwrite tap.exe otherwise -->
+        <File Path="Packages/OpenTAP/Tap.Upgrader.runtimeconfig.json" SourcePath="Tap.Upgrader.runtimeconfig.json"/>
         <File Path="Packages/OpenTAP/Tap.Upgrader.exe" SourcePath="Tap.Upgrader.exe">
+            <Sign Certificate="Keysight Technologies, Inc" Condition="$(Sign)==true"/>
+        </File>
+        <File Path="Packages/OpenTAP/Tap.Upgrader.dll" SourcePath="Tap.Upgrader.dll">
           <SetAssemblyInfo Attributes="Version"/>
           <Sign Certificate="Keysight Technologies, Inc" Condition="$(Sign)==true"/>
         </File>

diff --git a/sdk/Examples/Directory.Build.props b/sdk/Examples/Directory.Build.props
@@ -14,7 +14,7 @@
 	<PropertyGroup>
 		<!-- Ensure that all projects in this solution use the same version of OpenTAP -->		
 		<OpenTapVersion>$(GitVersion)</OpenTapVersion>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net8</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

diff --git a/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj b/sdk/Examples/PluginDevelopment.Gui/PluginDevelopment.Gui.csproj
@@ -6,7 +6,7 @@
     <!-- If your plugin is Windows only and you use Windows specific API's, feel free to change "netstandard2.0" below to "net462" and everything will work as when you are debugging. In this case, remember to change "OS" in package.xml to only "windows" -->
     <!-- If your plugin should be cross platform but does not build in release mode, please verify that all API's you used are available. You might need references or nuget packages for API's that are available in NET framework, but not in NetStandard -->
     <OpenTapPackageDefinitionPath>package.xml</OpenTapPackageDefinitionPath>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <Configurations>Debug;Release;Debug CE</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>

diff --git a/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj b/sdk/OpenTap.Sdk.MSBuild/OpenTap.Sdk.MSBuild.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>Keysight.OpenTap.Sdk.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <TargetFrameworkIdentifier></TargetFrameworkIdentifier>
     <TargetFrameworkVersion></TargetFrameworkVersion>
   </PropertyGroup>

diff --git a/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt b/sdk/OpenTap.Sdk.New/Resources/csprojTemplate.txt
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <TargetFrameworkIdentifier></TargetFrameworkIdentifier>
         <TargetFrameworkVersion></TargetFrameworkVersion>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net8</TargetFramework>
     </PropertyGroup>
 
   <PropertyGroup>
@@ -17,4 +17,4 @@
   <ItemGroup>
     <PackageReference Include="OpenTAP" Version="$(OpenTapVersion)" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/templates/src/project/ProjectName.csproj b/templates/src/project/ProjectName.csproj
@@ -6,7 +6,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetFrameworkIdentifier></TargetFrameworkIdentifier>
     <TargetFrameworkVersion></TargetFrameworkVersion>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <DebugWith>TapEditor</DebugWith>
   </PropertyGroup>
 
@@ -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.
     -->
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/NoAssemblyInfo.TapPlan b/tests/NoAssemblyInfo.TapPlan
@@ -20,7 +20,7 @@
   &lt;PropertyGroup&gt;
   &lt;TargetFrameworkIdentifier&gt;&lt;/TargetFrameworkIdentifier&gt;
     &lt;TargetFrameworkVersion&gt;&lt;/TargetFrameworkVersion&gt;
-    &lt;TargetFramework&gt;netstandard2.0&lt;/TargetFramework&gt;
+    &lt;TargetFramework&gt;net8&lt;/TargetFramework&gt;
     &lt;AppendTargetFrameworkToOutputPath&gt;false&lt;/AppendTargetFrameworkToOutputPath&gt;
     &lt;CopyLocalLockFileAssemblies&gt;true&lt;/CopyLocalLockFileAssemblies&gt;
    &lt;OutputPath&gt;bin/Debug&lt;/OutputPath&gt;

diff --git a/tests/package-create-error.TapPlan b/tests/package-create-error.TapPlan
@@ -13,7 +13,7 @@
                 &lt;PropertyGroup&gt;
                     &lt;TargetFrameworkIdentifier&gt;&lt;/TargetFrameworkIdentifier&gt;
                     &lt;TargetFrameworkVersion&gt;&lt;/TargetFrameworkVersion&gt;
-                    &lt;TargetFramework&gt;netstandard2.0&lt;/TargetFramework&gt;
+                    &lt;TargetFramework&gt;net8&lt;/TargetFramework&gt;
                     &lt;AppendTargetFrameworkToOutputPath&gt;false&lt;/AppendTargetFrameworkToOutputPath&gt;
                     &lt;CopyLocalLockFileAssemblies&gt;true&lt;/CopyLocalLockFileAssemblies&gt;
                     &lt;OutputPath&gt;bin/Debug&lt;/OutputPath&gt;
@@ -244,4 +244,4 @@
     </TestStep>
   </Steps>
   <BreakConditions>Inherit</BreakConditions>
-</TestPlan>
+</TestPlan>