Publish Core tools for internal use
Rob Mensching committed
Sep 24, 2017 at 15:06 UTC
feea62d5bd1f90bb012cb7cf2c84c9703f6568b2
10 files changed
+68
-11
appveyor.cmd
+5
-1
@@ -1,7 +1,11 @@
1
@setlocal
2
@pushd %~dp0
3
+@set _P=%~dp0build\Release\publish
4
4
-dotnet pack -c Release
5
+dotnet publish -c Release -o %_P% -r win-x86 src\wix
6
+dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
7
+
8
+dotnet pack -c Release src\WixToolset.Core.InternalPackage
9
10
@popd
11
@endlocal
\ No newline at end of file
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+5
-4
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>net462</TargetFramework>
6
+ <TargetFramework>net461</TargetFramework>
7
<Description></Description>
8
<Title>WiX Toolset MSBuild Tasks</Title>
9
</PropertyGroup>
@@ -14,8 +14,9 @@
14
</PropertyGroup>
15
16
<ItemGroup>
17
- <Content Include="redirect.wix.targets" CopyToOutputDirectory="PreserveNewest" />
18
- <Content Include="redirect.wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
17
+ <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
18
+ <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
19
+ <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
20
<Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
21
<Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
22
<Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
@@ -32,7 +33,7 @@
33
34
<ItemGroup>
35
<PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
35
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net462' " />
36
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net461' " />
37
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" PrivateAssets="all" Condition="'$(TargetFramework)'=='netstandard2.0' " />
38
</ItemGroup>
39
</Project>
src/WixToolset.BuildTasks/redirects/wix.ca.targets
renamed
-1
@@ -1,7 +1,6 @@
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
-
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
<PropertyGroup>
6
<WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
src/WixToolset.BuildTasks/redirects/wix.props
new
+8
@@ -0,0 +1,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
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
+ <PropertyGroup>
6
+ <WixTargetsPath>$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
7
+ </PropertyGroup>
8
+</Project>
src/WixToolset.BuildTasks/redirects/wix.targets
renamed
-1
@@ -1,7 +1,6 @@
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
-
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
<PropertyGroup>
6
<WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
new
+26
@@ -0,0 +1,26 @@
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
+<Project Sdk="Microsoft.NET.Sdk">
5
+ <PropertyGroup>
6
+ <TargetFramework>netstandard2.0</TargetFramework>
7
+ <IncludeBuildOutput>false</IncludeBuildOutput>
8
+ <Description>Internal WiX Toolset Tools</Description>
9
+ <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
10
+ <NuspecBasePath>$(OutputPath)publish</NuspecBasePath>
11
+ <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
12
+ </PropertyGroup>
13
+
14
+ <ItemGroup>
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
16
+ </ItemGroup>
17
+
18
+ <Target Name="SetNuspecVersion"
19
+ AfterTargets="GetBuildVersion">
20
+ <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
21
+
22
+ <PropertyGroup>
23
+ <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties>
24
+ </PropertyGroup>
25
+ </Target>
26
+</Project>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
new
+21
@@ -0,0 +1,21 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3
+ <metadata>
4
+ <id>$id$</id>
5
+ <version>$version$</version>
6
+ <authors>$authors$</authors>
7
+ <owners>$authors$</owners>
8
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
9
+ <description>$description$</description>
10
+ <copyright>$copyright$</copyright>
11
+ </metadata>
12
+
13
+ <files>
14
+ <file src="redirects\wix.props" target="build" />
15
+
16
+ <file src="redirects\wix.targets" target="msbuild" />
17
+ <file src="redirects\wix.ca.targets" target="msbuild" />
18
+
19
+ <file src="*" target="tools" />
20
+ </files>
21
+</package>
src/test/WixToolsetTest.BuildTasks/data/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+1
-4
@@ -12,10 +12,7 @@
12
</PropertyGroup>
13
14
<PropertyGroup>
15
- <WixTargetsPath>..\..\..\..\..\..\build\Debug\net462\wix.targets</WixTargetsPath>
16
- <WixTargetsPath>..\..\..\..\..\..\build\Debug\netstandard2.0\wix.targets</WixTargetsPath>
17
- <WixTargetsPath>..\..\..\..\..\..\build\publish\wix.targets</WixTargetsPath>
18
- <WixTargetsPath>..\..\..\..\..\..\build\Debug\net462\wix.targets</WixTargetsPath>
15
+ <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\wix.targets</WixTargetsPath>
16
</PropertyGroup>
17
18
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
src/test/WixToolsetTest.BuildTasks/data/SimpleMsiPackage/MsiPackage/i.txt
Binary files a/src/test/WixToolsetTest.BuildTasks/data/SimpleMsiPackage/MsiPackage/i.txt and /dev/null differ
src/wix/wix.csproj
+2
@@ -13,9 +13,11 @@
13
<NoWarn>NU1701</NoWarn>
14
</PropertyGroup>
15
16
+ <!--
17
<ItemGroup>
18
<Content Include="wix.cmd" CopyToOutputDirectory="PreserveNewest" />
19
</ItemGroup>
20
+ -->
21
22
<ItemGroup>
23
<ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />