Add WixBuildTools.TestSupport.Native.nupkg.
Sean Hall committed
Jul 15, 2020 at 17:33 UTC
0671c1c92c26bd23a422de6b8c6d8beeabb0f2db
4 files changed
+62
-1
appveyor.cmd
+7
-1
@@ -1,7 +1,13 @@
1
@setlocal
2
@pushd %~dp0
3
4
-dotnet pack -c Release
4
+nuget restore || exit /b
5
+
6
+dotnet pack -c Release src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
7
+dotnet pack -c Release src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b
8
+dotnet pack -c Release src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
9
+
10
+msbuild -p:Configuration=Release -t:PackNativeNuget src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b
11
12
@popd
13
@endlocal
\ No newline at end of file
src/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec
new
+26
@@ -0,0 +1,26 @@
1
+<?xml version="1.0"?>
2
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3
+ <metadata minClientVersion="4.0">
4
+ <id>$id$</id>
5
+ <version>$version$</version>
6
+ <authors>$authors$</authors>
7
+ <owners>$authors$</owners>
8
+ <license type="expression">MS-RL</license>
9
+ <projectUrl>https://github.com/wixtoolset/WixBuildTools</projectUrl>
10
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
11
+ <description>$description$</description>
12
+ <copyright>$copyright$</copyright>
13
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14
+ <dependencies>
15
+ <group targetFramework=".NETFramework4.7.2" />
16
+ </dependencies>
17
+ </metadata>
18
+
19
+ <files>
20
+ <file src="build\$id$.props" target="build" />
21
+ <file src="build\$id$.targets" target="build" />
22
+
23
+ <file src="$outputpath$$id$.dll" target="lib\net472" />
24
+ <file src="$outputpath$$id$.pdb" target="lib\net472" />
25
+ </files>
26
+</package>
src/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+25
@@ -4,6 +4,9 @@
4
5
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6
<Import Project="build\WixBuildTools.TestSupport.Native.props" />
7
+ <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
8
+ <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
9
+ <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
<ProjectConfiguration Include="Debug|Win32">
12
<Configuration>Debug</Configuration>
@@ -22,9 +25,16 @@
25
<ConfigurationType>DynamicLibrary</ConfigurationType>
26
<CharacterSet>Unicode</CharacterSet>
27
<CLRSupport>true</CLRSupport>
28
+ <Description>WixBuildTools C++/CLI Test Support</Description>
29
</PropertyGroup>
30
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
31
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32
+ <ImportGroup Label="Shared">
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')" />
37
+ </ImportGroup>
38
<PropertyGroup>
39
<ProjectAdditionalIncludeDirectories>
40
</ProjectAdditionalIncludeDirectories>
@@ -57,4 +67,19 @@
67
</ItemGroup>
68
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
69
<Import Project="build\WixBuildTools.TestSupport.Native.targets" />
70
+ <Target Name="PackNativeNuget" DependsOnTargets="Build">
71
+ <Exec Command='nuget pack $(MSBuildThisFileName).nuspec -OutputDirectory "$(OutputPath).." -Properties Id=$(MSBuildThisFileName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);OutputPath=$(OutputPath)' />
72
+ </Target>
73
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
74
+ <PropertyGroup>
75
+ <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>
76
+ </PropertyGroup>
77
+ <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
78
+ <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
79
+ <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
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'))" />
84
+ </Target>
85
</Project>
\ No newline at end of file
src/WixBuildTools.TestSupport.Native/packages.config
+4
@@ -3,6 +3,10 @@
3
4
5
<packages>
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" />
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" />