diff options
Diffstat (limited to 'src/wixnative')
-rw-r--r-- | src/wixnative/runtime.win.WixToolset.Core.Native.nuspec | 24 | ||||
-rw-r--r-- | src/wixnative/wixnative.vcxproj | 13 |
2 files changed, 0 insertions, 37 deletions
diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec deleted file mode 100644 index a775b570..00000000 --- a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
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 | <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl> | ||
10 | <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl> | ||
11 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
12 | <description>$description$</description> | ||
13 | <copyright>$copyright$</copyright> | ||
14 | </metadata> | ||
15 | |||
16 | <files> | ||
17 | <file src="Win32\mergemod.dll" target="runtimes\win-x86\native" /> | ||
18 | <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> | ||
19 | <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> | ||
20 | <file src="x64\mergemod.dll" target="runtimes\win-x64\native" /> | ||
21 | <file src="x64\wixnative.exe" target="runtimes\win-x64\native" /> | ||
22 | <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" /> | ||
23 | </files> | ||
24 | </package> | ||
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj index 5927c14c..e53af651 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wixnative/wixnative.vcxproj | |||
@@ -30,7 +30,6 @@ | |||
30 | <TargetName>wixnative</TargetName> | 30 | <TargetName>wixnative</TargetName> |
31 | <PlatformToolset>v141</PlatformToolset> | 31 | <PlatformToolset>v141</PlatformToolset> |
32 | <CharacterSet>Unicode</CharacterSet> | 32 | <CharacterSet>Unicode</CharacterSet> |
33 | <Description>Native component of WixToolset.Core</Description> | ||
34 | </PropertyGroup> | 33 | </PropertyGroup> |
35 | 34 | ||
36 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 35 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
@@ -69,18 +68,6 @@ | |||
69 | <None Include="packages.config" /> | 68 | <None Include="packages.config" /> |
70 | </ItemGroup> | 69 | </ItemGroup> |
71 | 70 | ||
72 | <ItemGroup> | ||
73 | <None Include="$(Platform)\mergemod.dll"> | ||
74 | <DeploymentContent>true</DeploymentContent> | ||
75 | <Link>%(Filename)%(Extension)</Link> | ||
76 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
77 | </None> | ||
78 | </ItemGroup> | ||
79 | |||
80 | <Target Name="Pack" DependsOnTargets="GetBuildVersion"> | ||
81 | <Exec Command='nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' /> | ||
82 | </Target> | ||
83 | |||
84 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 71 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
85 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 72 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
86 | <PropertyGroup> | 73 | <PropertyGroup> |