From baeb80bfb2a9b5593efab21249dae43129786d53 Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Wed, 25 May 2022 06:58:10 +0000 Subject: [PATCH] Merged PR 7243262: Upgrade DotNet SDK for PTF Upgrade DotNet SDK to 6 Related work items: #39128467 --- pipelines/azure-pipelines.yml | 4 ++-- .../XXXX_Adapter/XXXX_Adapter.csproj | 4 ++-- .../XXXX_TestSuite/XXXX_TestSuite.csproj | 10 +++++----- src/PTFTestLogger/PTFTestLogger.csproj | 6 +++--- src/SharedAssemblyInfo.cs | 4 ++-- .../TestFramework.AdapterConsole.csproj | 2 +- src/TestFramework/TestFramework.csproj | 11 +++++++--- src/TestFramework/TestFramework.nuspec | 20 ++++++++++++------- src/UnitTest/UnitTest.csproj | 11 +++++----- src/build.ps1 | 4 +++- 10 files changed, 45 insertions(+), 31 deletions(-) diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 216009e..feccb47 100644 --- 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 index d066180..ea0caf3 100644 --- a/samples/XXXX_ProtocolTestSuite/XXXX_Adapter/XXXX_Adapter.csproj +++ b/samples/XXXX_ProtocolTestSuite/XXXX_Adapter/XXXX_Adapter.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 XXXX_Adapter Microsoft.Protocols.TestSuites.XXXX.Adapter false @@ -12,7 +12,7 @@ - + diff --git a/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj b/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj index 3e64499..e7e850d 100644 --- a/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj +++ b/samples/XXXX_ProtocolTestSuite/XXXX_TestSuite/XXXX_TestSuite.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 Library Microsoft.Protocols.TestSuites.XXXX.TestSuite false @@ -20,11 +20,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + - - + + + diff --git a/src/PTFTestLogger/PTFTestLogger.csproj b/src/PTFTestLogger/PTFTestLogger.csproj index af49f90..9bf848a 100644 --- a/src/PTFTestLogger/PTFTestLogger.csproj +++ b/src/PTFTestLogger/PTFTestLogger.csproj @@ -1,6 +1,6 @@  - net5.0 + net5.0;net6.0 Library Microsoft Microsoft.Protocols.TestTools.PTFTestLogger @@ -32,8 +32,8 @@ - - + + \ No newline at end of file diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index dd5f715..6c17c86 100644 --- 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.")] \ No newline at end of file diff --git a/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj b/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj index 6e52884..7988885 100644 --- a/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj +++ b/src/TestFramework.AdapterConsole/TestFramework.AdapterConsole.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net5.0 Microsoft.Protocols.TestTools.AdapterConsole Microsoft.Protocols.TestTools.AdapterConsole Interactive console adapter diff --git a/src/TestFramework/TestFramework.csproj b/src/TestFramework/TestFramework.csproj index f3aa4ac..f5e02fd 100644 --- a/src/TestFramework/TestFramework.csproj +++ b/src/TestFramework/TestFramework.csproj @@ -1,7 +1,7 @@  - net5.0 + net5.0;net6.0 Microsoft.Protocols.TestTools Microsoft.Protocols.TestTools Microsoft.Protocols.TestTools @@ -45,8 +45,13 @@ - - + + + + + + + diff --git a/src/TestFramework/TestFramework.nuspec b/src/TestFramework/TestFramework.nuspec index 6bd394f..528b939 100644 --- a/src/TestFramework/TestFramework.nuspec +++ b/src/TestFramework/TestFramework.nuspec @@ -2,7 +2,7 @@ Microsoft.Protocols.TestTools - 2.2.0 + 2.3.0 Protocol Test Framework Microsoft Microsoft @@ -14,16 +14,19 @@ © Microsoft Corporation. All rights reserved. TestFramework Testing ProtocolTest - 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. - - + + + + + + @@ -34,8 +37,11 @@ + + + diff --git a/src/UnitTest/UnitTest.csproj b/src/UnitTest/UnitTest.csproj index c64a460..e1d4786 100644 --- a/src/UnitTest/UnitTest.csproj +++ b/src/UnitTest/UnitTest.csproj @@ -1,7 +1,7 @@ - + - net5.0 + net6.0 false Microsoft.Protocols.TestTools.UnitTest Microsoft.Protocols.TestTools.UnitTest @@ -14,12 +14,13 @@ - - + + + - + diff --git a/src/build.ps1 b/src/build.ps1 index 564a93f..bd331d5 100644 --- 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)