From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001 From: giy <giy@omp-system.ru> Date: Fri, 02 Sep 2022 14:16:56 +0300 Subject: [PATCH] Обновление до версии 2.9.0 --- Tests/Test_QtMsBuild.Tasks/Test_QtMsBuild.Tasks.csproj | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Tests/Test_QtMsBuild.Tasks/Test_QtMsBuild.Tasks.csproj b/Tests/Test_QtMsBuild.Tasks/Test_QtMsBuild.Tasks.csproj index 77bbb75..b4ae05a 100644 --- a/Tests/Test_QtMsBuild.Tasks/Test_QtMsBuild.Tasks.csproj +++ b/Tests/Test_QtMsBuild.Tasks/Test_QtMsBuild.Tasks.csproj @@ -76,17 +76,35 @@ </ItemGroup> <!-- ///////////////////////////////////////////////////////////////////////////////////////////////// - // Version specific references + // General package references // --> <Import Project="$(SolutionDir)\references.props" /> <ItemGroup> - <PackageReference Include="Microsoft.Build" Version="$(Version_Microsoft_Build)" /> - <PackageReference Include="Microsoft.Build.Framework" Version="$(Version_Microsoft_Build_Framework)" /> - <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(Version_Microsoft_Build_Tasks_Core)" /> - <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(Version_Microsoft_Bcl_AsyncInterfaces)" /> - <PackageReference Include="MSTest.TestAdapter" Version="$(Version_MSTest_TestAdapter)" /> - <PackageReference Include="MSTest.TestFramework" Version="$(Version_MSTest_TestFramework)" /> + <PackageReference Include="$(Name_Microsoft_VSSDK_BuildTools)" Version="$(Version_Microsoft_VSSDK_BuildTools)" /> + <PackageReference Include="$(Name_Microsoft_VisualStudio_SDK)" Version="$(Version_Microsoft_VisualStudio_SDK)" ExcludeAssets="runtime" /> + <PackageReference Include="$(Name_Microsoft_Build)" Version="$(Version_Microsoft_Build)" /> + <PackageReference Include="$(Name_Microsoft_Build_Tasks_Core)" Version="$(Version_Microsoft_Build_Tasks_Core)" /> + <PackageReference Include="$(Name_MSTest_TestAdapter)" Version="$(Version_MSTest_TestAdapter)" /> + <PackageReference Include="$(Name_MSTest_TestFramework)" Version="$(Version_MSTest_TestFramework)" /> </ItemGroup> + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Version specific package references + // --> + <Choose> + <When Condition="'$(VisualStudioVersion)'=='17.0'"> + <ItemGroup> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)'=='16.0'"> + <ItemGroup> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)'=='15.0'"> + <ItemGroup> + </ItemGroup> + </When> + </Choose> <!-- ///////////////////////////////////////////////////////////////////////////////////////////////// // Solution project references @@ -105,6 +123,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="TestTaskLoggingHelper.cs" /> <Compile Include="Test_Join.cs" /> + <Compile Include="Test_QtRunTask.cs" /> </ItemGroup> <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -- Gitblit v1.9.1