diff options
Diffstat (limited to 'src/internal/WixBuildTools.TestSupport.Native')
3 files changed, 18 insertions, 18 deletions
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props index a0952197..d9d9dab4 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props | |||
@@ -1,11 +1,11 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> | 6 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> | 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props')" /> |
9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" /> | 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" /> |
10 | <PropertyGroup> | 10 | <PropertyGroup> |
11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets index 5b6f2ef3..3d28ed57 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets | |||
@@ -22,30 +22,30 @@ | |||
22 | <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> | 22 | <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> |
23 | </Reference> | 23 | </Reference> |
24 | <Reference Include="xunit.assert"> | 24 | <Reference Include="xunit.assert"> |
25 | <HintPath>$(RootPackagesFolder)xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath> | 25 | <HintPath>$(RootPackagesFolder)xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath> |
26 | </Reference> | 26 | </Reference> |
27 | <Reference Include="xunit.core"> | 27 | <Reference Include="xunit.core"> |
28 | <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath> | 28 | <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath> |
29 | </Reference> | 29 | </Reference> |
30 | <Reference Include="xunit.execution.desktop"> | 30 | <Reference Include="xunit.execution.desktop"> |
31 | <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath> | 31 | <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath> |
32 | </Reference> | 32 | </Reference> |
33 | </ItemGroup> | 33 | </ItemGroup> |
34 | 34 | ||
35 | <Import Project="$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" /> | 35 | <Import Project="$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" /> |
36 | <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" /> | 36 | <Import Project="$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" /> |
37 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 37 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
38 | <PropertyGroup> | 38 | <PropertyGroup> |
39 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 39 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
40 | </PropertyGroup> | 40 | </PropertyGroup> |
41 | <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets'))" /> | 41 | <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets'))" /> |
42 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props'))" /> | 42 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props'))" /> |
43 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets'))" /> | 43 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets'))" /> |
44 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" /> | 44 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" /> |
45 | </Target> | 45 | </Target> |
46 | 46 | ||
47 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " /> | 47 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " /> |
48 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " /> | 48 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " /> |
49 | <Target Name="Test"> | 49 | <Target Name="Test"> |
50 | <!-- https://xunit.net/docs/running-tests-in-msbuild --> | 50 | <!-- https://xunit.net/docs/running-tests-in-msbuild --> |
51 | <!-- https://github.com/xunit/xunit/issues/2188 --> | 51 | <!-- https://github.com/xunit/xunit/issues/2188 --> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config index 5fa2cecb..060bff6b 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/packages.config +++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config | |||
@@ -6,12 +6,12 @@ | |||
6 | Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets | 6 | Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets |
7 | when any of these versions are updated. | 7 | when any of these versions are updated. |
8 | --> | 8 | --> |
9 | <package id="GitInfo" version="2.1.2" /> | 9 | <package id="GitInfo" version="2.2.0" /> |
10 | <package id="xunit.abstractions" version="2.0.3" /> | 10 | <package id="xunit.abstractions" version="2.0.3" /> |
11 | <package id="xunit.assert" version="2.4.1" /> | 11 | <package id="xunit.assert" version="2.4.2" /> |
12 | <package id="xunit.core" version="2.4.1" /> | 12 | <package id="xunit.core" version="2.4.2" /> |
13 | <package id="xunit.extensibility.core" version="2.4.1" /> | 13 | <package id="xunit.extensibility.core" version="2.4.2" /> |
14 | <package id="xunit.extensibility.execution" version="2.4.1" /> | 14 | <package id="xunit.extensibility.execution" version="2.4.2" /> |
15 | <package id="xunit.runner.msbuild" version="2.4.1" /> | 15 | <package id="xunit.runner.msbuild" version="2.4.2" /> |
16 | <package id="xunit.runner.visualstudio" version="2.4.5" /> | 16 | <package id="xunit.runner.visualstudio" version="2.4.5" /> |
17 | </packages> | 17 | </packages> |