@joebigelow / wix / commits / 730f9d2f

Add test target to C++/CLI projects.

Sean Hall committed Nov 15, 2020 at 12:16 UTC 730f9d2f8c62e282b6f0eba644fa5ac90a0a558f
6 files changed +13 -8
src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+1 -1
@@ -19,7 +19,7 @@
19
20 <ItemGroup>
21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
22 - <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
22 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
23 </ItemGroup>
24
25 </Project>
src/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+2 -2
@@ -33,7 +33,7 @@
33 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
34 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
35 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
36 - <Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />
36 + <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
37 </ImportGroup>
38 <PropertyGroup>
39 <ProjectAdditionalIncludeDirectories>
@@ -80,6 +80,6 @@
80 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
81 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
82 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
83 - <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
83 + <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
84 </Target>
85 </Project>
\ No newline at end of file
src/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+4
@@ -12,4 +12,8 @@
12 <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
13 <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
14 </Target>
15 + <UsingTask AssemblyFile="$(RepoRootDir)\packages\xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
16 + <Target Name="Test" DependsOnTargets="Build">
17 + <xunit Assemblies="$(TargetPath)" />
18 + </Target>
19 </Project>
\ No newline at end of file
src/WixBuildTools.TestSupport.Native/packages.config
+4 -3
@@ -1,4 +1,4 @@
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. -->
3
4
@@ -6,11 +6,12 @@
6 <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
7 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
8 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
9 - <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" />
9 + <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
10 <package id="xunit.abstractions" version="2.0.3" />
11 <package id="xunit.assert" version="2.4.1" />
12 <package id="xunit.core" version="2.4.1" />
13 <package id="xunit.extensibility.core" version="2.4.1" />
14 <package id="xunit.extensibility.execution" version="2.4.1" />
15 + <package id="xunit.runner.msbuild" version="2.4.1" />
16 <package id="xunit.runner.visualstudio" version="2.4.1" />
16 -</packages>
17 +</packages>
\ No newline at end of file
src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+1 -1
@@ -19,7 +19,7 @@
19
20 <ItemGroup>
21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
22 - <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
22 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
23 </ItemGroup>
24
25 <ItemGroup>
src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+1 -1
@@ -20,7 +20,7 @@
20
21 <ItemGroup>
22 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
23 - <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
23 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
24 </ItemGroup>
25
26 </Project>