Merged PR 7243262: Upgrade DotNet SDK for PTF

Upgrade DotNet SDK to 6 Related work items: #39128467
microsoft · May 25, 2022 · baeb80b · baeb80b
1 parent 6876a33
commit baeb80b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 31 deletions.
diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml
@@ -1,4 +1,4 @@
-trigger: none 
+trigger: none
 
 variables:
   - group: Build Variables
@@ -7,7 +7,7 @@ jobs:
 - job:
   displayName: Publish NuGet package
   pool:
-    vmImage: windows-2019
+    vmImage: windows-2022
   workspace:
     clean: false
   timeoutInMinutes: 0

diff --git a/samples/XXXX_ProtocolTestSuite/XXXX_Adapter/XXXX_Adapter.csproj b/samples/XXXX_ProtocolTestSuite/XXXX_Adapter/XXXX_Adapter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>XXXX_Adapter</AssemblyName>
     <RootNamespace>Microsoft.Protocols.TestSuites.XXXX.Adapter</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -12,7 +12,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Protocols.TestTools" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Protocols.TestTools" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="XXXX_SUTControlAdapter\ResetSUT.ps1">

diff --git a/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj b/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Protocols.TestSuites.XXXX.TestSuite</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -20,11 +20,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="Microsoft.Protocols.TestTools" Version="2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="Microsoft.Protocols.TestTools" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\XXXX_Adapter\XXXX_Adapter.csproj" />

diff --git a/src/PTFTestLogger/PTFTestLogger.csproj b/src/PTFTestLogger/PTFTestLogger.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft</RootNamespace>
     <AssemblyName>Microsoft.Protocols.TestTools.PTFTestLogger</AssemblyName>
@@ -32,8 +32,8 @@
     <Content Include="Resources\index.html" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.7.0" />
+	<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.2.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -4,6 +4,6 @@
 using System.Reflection;
 
 [assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 [assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
diff --git a/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj b/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.Protocols.TestTools.AdapterConsole</AssemblyName>
     <RootNamespace>Microsoft.Protocols.TestTools.AdapterConsole</RootNamespace>
     <Description>Interactive console adapter</Description>

diff --git a/src/TestFramework/TestFramework.csproj b/src/TestFramework/TestFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <PackageId>Microsoft.Protocols.TestTools</PackageId>
     <AssemblyName>Microsoft.Protocols.TestTools</AssemblyName>
     <RootNamespace>Microsoft.Protocols.TestTools</RootNamespace>
@@ -45,8 +45,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.7" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TestFramework/TestFramework.nuspec b/src/TestFramework/TestFramework.nuspec
@@ -2,7 +2,7 @@
 <package >
 	<metadata>
 		<id>Microsoft.Protocols.TestTools</id>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 		<title>Protocol Test Framework</title>
 		<authors>Microsoft</authors>
 		<owners>Microsoft</owners>
@@ -14,16 +14,19 @@
 		<copyright>© Microsoft Corporation. All rights reserved.</copyright>
 		<tags>TestFramework Testing ProtocolTest</tags>
 		<releaseNotes>
-			1. The PTF now supports HTML Test logger.
-			2. The PTF now supports to specify Timeout to invoke Adapter method.
-			3. The PipeSink now supports to specify pipe name.
-			4. The dependent PowerShell Core SDK is upgraded to 7.1.3.
+			1. The PTF now supports both .NET 5 and .NET 6.
+            2. The dependent MSTest.TestFramework is upgraded to 2.2.10.
+			3. The dependent PowerShell Core SDK is upgraded to 7.2.4.
         </releaseNotes>
 		<repository type="git" url="https://github.com/microsoft/ProtocolTestFramework" />
 		<dependencies>
 			<group targetFramework="net5.0">
-				<dependency id="MSTest.TestFramework" version="2.1.0" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.PowerShell.SDK" version="7.1.3" exclude="Build,Analyzers" />
+				<dependency id="MSTest.TestFramework" version="2.2.10" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.PowerShell.SDK" version="7.1.7" exclude="Build,Analyzers" />
+			</group>
+			<group targetFramework="net6.0">
+				<dependency id="MSTest.TestFramework" version="2.2.10" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.PowerShell.SDK" version="7.2.4" exclude="Build,Analyzers" />
 			</group>
 		</dependencies>
 		<contentFiles>
@@ -34,8 +37,11 @@
 		<file src="Resources\packageIcon.png" target="" />
 		<file src="..\..\LICENSE.txt" target="" />
 		<file src="Microsoft.Protocols.TestTools.dll" target="lib\net5.0" />
+		<file src="net6\Microsoft.Protocols.TestTools.dll" target="lib\net6.0" />
 		<file src="Microsoft.Protocols.TestTools.AdapterConsole.dll" target="lib\net5.0" />
+		<file src="Microsoft.Protocols.TestTools.AdapterConsole.dll" target="lib\net6.0" />
 		<file src="Microsoft.Protocols.TestTools.PTFTestLogger.dll" target="lib\net5.0" />
+		<file src="net6\Microsoft.Protocols.TestTools.PTFTestLogger.dll" target="lib\net6.0" />
 		<file src="Resources\Microsoft.Protocols.TestTools.AdapterConsole.runtimeconfig.json" target="contentFiles\any\any" />
 		<file src="build\Microsoft.Protocols.TestTools.targets" target="build\" />
 	</files>

diff --git a/src/UnitTest/UnitTest.csproj b/src/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>Microsoft.Protocols.TestTools.UnitTest</AssemblyName>
     <RootNamespace>Microsoft.Protocols.TestTools.UnitTest</RootNamespace>
@@ -14,12 +14,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+	  <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TestFramework\TestFramework.csproj" />
+	  <ProjectReference Include="..\TestFramework\TestFramework.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/build.ps1 b/src/build.ps1
@@ -10,7 +10,9 @@ if(Test-Path drop){
 }
 dotnet build .\TestFramework\TestFramework.csproj --configuration Release
 
-dotnet publish .\TestFramework\TestFramework.csproj -o drop
+dotnet publish .\TestFramework\TestFramework.csproj -o drop -f net5.0
+
+dotnet publish .\TestFramework\TestFramework.csproj -o drop/net6 -f net6.0
 
 nuget pack drop\TestFramework.nuspec
 $packageFile = [xml](Get-Content drop\TestFramework.nuspec)