Merge the native nupkg into the Mba.Core nupkg.
Manually author the repository element in the nupkg for SourceLink.
Sean Hall committed
Jun 24, 2020 at 16:18 UTC
57fc25f5bf81dcc5edbf1b1e7c331dde8fe4578f
5 files changed
+17
-40
appveyor.cmd
-1
@@ -22,7 +22,6 @@ dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.M
22
msbuild -t:Pack -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b
23
msbuild -t:Pack -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b
24
msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
25
-msbuild -t:Pack -p:Configuration=%_C% src\mbanative\mbanative.vcxproj || exit /b
25
26
@popd
27
@endlocal
\ No newline at end of file
src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+1
-1
@@ -61,7 +61,7 @@
61
<Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
62
<PropertyGroup>
63
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
64
- <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
64
+ <NuspecProperties>Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties>
65
</PropertyGroup>
66
</Target>
67
</Project>
\ No newline at end of file
src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+16
-8
@@ -1,25 +1,33 @@
1
<?xml version="1.0"?>
2
-<package >
3
- <metadata>
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>WiX Toolset Team</authors>
7
- <owners>WiX Toolset Team</owners>
6
+ <authors>$authors$</authors>
7
+ <owners>$authors$</owners>
8
<license type="expression">MS-RL</license>
9
<projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
10
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11
<description>$description$</description>
12
<copyright>$copyright$</copyright>
13
-
13
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14
<dependencies>
15
- <group>
16
- <dependency id="runtime.win.WixToolset.Mba.Core" version="$version$" />
17
- </group>
15
+ <group targetFramework=".NETFramework2.0" />
16
+ <group targetFramework=".NETStandard2.0" />
17
</dependencies>
18
</metadata>
19
20
<files>
21
<file src="net20\$id$.dll" target="lib\net20" />
22
<file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
23
+
24
+ <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
25
+ <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
26
+ <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
27
+ <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
28
+ <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
29
+ <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
30
+ <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
31
+ <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
32
</files>
33
</package>
src/mbanative/mbanative.vcxproj
-5
@@ -50,7 +50,6 @@
50
<CharacterSet>Unicode</CharacterSet>
51
<TargetName>mbanative</TargetName>
52
<ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
53
- <Description>Native component of WixToolset.Mba.Core</Description>
53
<EnableSourceLink Condition=" '$(PlatformToolset)'=='v140' ">false</EnableSourceLink>
54
</PropertyGroup>
55
@@ -91,10 +90,6 @@
90
<ProjectReference Include="..\balutil\balutil.vcxproj" />
91
</ItemGroup>
92
94
- <Target Name="Pack" DependsOnTargets="GetBuildVersion">
95
- <Exec Command='nuget pack runtime.win.WixToolset.Mba.Core.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Mba.Core;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
96
- </Target>
97
-
93
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
94
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
95
<PropertyGroup>
src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
deleted
-25
@@ -1,25 +0,0 @@
1
-<?xml version="1.0"?>
2
-<package >
3
- <metadata>
4
- <id>$id$</id>
5
- <version>$version$</version>
6
- <authors>WiX Toolset Team</authors>
7
- <owners>WiX Toolset Team</owners>
8
- <license type="expression">MS-RL</license>
9
- <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
10
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
11
- <description>$description$</description>
12
- <copyright>$copyright$</copyright>
13
- </metadata>
14
-
15
- <files>
16
- <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
17
- <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
18
- <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
19
- <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
20
- <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
21
- <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
22
- <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
23
- <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
24
- </files>
25
-</package>