Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/next wixhelper #2002

Merged
merged 11 commits into from
Jul 21, 2018
+1,974 −110
Merged

Release/next wixhelper #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c56e14
Migration of WiX module to FAKE 5
nt185071 Jun 19, 2018
04d80ef
Clarify some obsolete descriptions
nt185071 Jun 19, 2018
b40857b
Merge branch 'release/next' of https://github.com/fsharp/FAKE into re…
nt185071 Jun 19, 2018
f119b09
Merge branch 'release/next' into release/next-wixhelper
cthangn Jun 19, 2018
f64fa3c
Merge branch 'release/next-wixhelper' of https://github.com/cthangn/F…
nt185071 Jun 19, 2018
3f819a6
Clean up sln file
nt185071 Jun 19, 2018
bb40bc6
remove obsolete types
nt185071 Jul 2, 2018
ea53080
Move Wix proj. to Fake.Installer
nt185071 Jul 9, 2018
f369ab6
more internals
nt185071 Jul 11, 2018
9bc9c5b
fix wrong internal declaration in rec function
nt185071 Jul 11, 2018
059d447
rename remaining Windows.Wix to Installer.Wix
cthangn Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Fake.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fake-template", "src\templa
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Cli.IntegrationTests", "src\test\Fake.DotNet.Cli.IntegrationTests\Fake.DotNet.Cli.IntegrationTests.fsproj", "{48ECC58D-468C-4D44-98B3-854C21EB0D40}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Installer.Wix", "src\app\Fake.Installer.Wix\Fake.Installer.Wix.fsproj", "{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UserInput", "src\app\Fake.Core.UserInput\Fake.Core.UserInput.fsproj", "{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}"
EndProject
Global
Expand Down Expand Up @@ -960,6 +962,18 @@ Global
{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x64.Build.0 = Release|Any CPU
{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x86.ActiveCfg = Release|Any CPU
{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x86.Build.0 = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x64.ActiveCfg = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x64.Build.0 = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x86.ActiveCfg = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x86.Build.0 = Debug|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|Any CPU.Build.0 = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x64.ActiveCfg = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x64.Build.0 = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x86.ActiveCfg = Release|Any CPU
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x86.Build.0 = Release|Any CPU
{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1045,6 +1059,7 @@ Global
{872B282D-8A3E-459A-B63D-C43C5D73506D} = {539D7B9A-18A1-4D79-86AB-C8B48090CA84}
{29B66A06-1A45-4D65-AC31-7D746449E5D6} = {872B282D-8A3E-459A-B63D-C43C5D73506D}
{48ECC58D-468C-4D44-98B3-854C21EB0D40} = {E09B72E4-D890-46A8-8D14-7367C2E23E9D}
{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
1 change: 1 addition & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ let dotnetAssemblyInfos =
"Fake.DotNet.Testing.XUnit2", "Running xunit test runner"
"Fake.DotNet.Xamarin", "Running Xamarin builds"
"Fake.Installer.InnoSetup", "Creating installers with InnoSetup"
"Fake.Installer.Wix", "WiX helper to create msi installers"
"Fake.IO.FileSystem", "Core Filesystem utilities and globbing support"
"Fake.IO.Zip", "Core Zip functionality"
"Fake.JavaScript.Npm", "Running npm commands"
Expand Down
17 changes: 17 additions & 0 deletions src/app/Fake.Installer.Wix/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("FAKE - F# Make WiX helper to create msi installers")>]
[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
[<assembly: AssemblyVersionAttribute("5.1")>]
[<assembly: AssemblyInformationalVersionAttribute("5.1.0-alpha.1")>]
[<assembly: AssemblyFileVersionAttribute("5.1.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FAKE - F# Make WiX helper to create msi installers"
let [<Literal>] AssemblyProduct = "FAKE - F# Make"
let [<Literal>] AssemblyVersion = "5.1"
let [<Literal>] AssemblyInformationalVersion = "5.1.0-alpha.1"
let [<Literal>] AssemblyFileVersion = "5.1.0"
19 changes: 19 additions & 0 deletions src/app/Fake.Installer.Wix/Fake.Installer.Wix.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
<AssemblyName>Fake.Installer.Wix</AssemblyName>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Fake.Core.Environment\Fake.Core.Environment.fsproj" />
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.Core.Trace\Fake.Core.Trace.fsproj" />
<ProjectReference Include="..\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj" />
<ProjectReference Include="..\Fake.Core.Process\Fake.Core.Process.fsproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Wix.fs" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
Loading