Skip to content

Commit

Permalink
WiX4-Release v2.1.2.0
Browse files Browse the repository at this point in the history
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip
  • Loading branch information
oleg-shilo committed Mar 4, 2024
1 parent ff9528d commit 776b5d8
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 102 deletions.
22 changes: 9 additions & 13 deletions Source/NuGet/WixSharp/WixSharp.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp.WPF</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,24 +16,20 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2021 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="2.1.1.0" />
<dependency id="WixSharp.bin" version="2.1.2.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</dependencies>
<references>
Expand Down
20 changes: 8 additions & 12 deletions Source/NuGet/WixSharp/WixSharp.bin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>WixSharp.bin</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,17 +16,13 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
Expand Down
22 changes: 9 additions & 13 deletions Source/NuGet/WixSharp/WixSharp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,24 +18,20 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
In order to use this package you need have WiX Toolset installed.
The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2022 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp.bin" version="2.1.1.0" />
<dependency id="WixSharp.bin" version="2.1.2.0" />
</dependencies>
</metadata>
<files>
Expand Down
22 changes: 9 additions & 13 deletions Source/NuGet/WixSharp/WixSharp_wix4.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp-wix4.WPF</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,24 +16,20 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp_wix4.bin" version="2.1.1.0" />
<dependency id="WixSharp_wix4.bin" version="2.1.2.0" />
<dependency id="Caliburn.Micro" version="4.0.212" />
</dependencies>
<references>
Expand Down
20 changes: 8 additions & 12 deletions Source/NuGet/WixSharp/WixSharp_wix4.bin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>WixSharp_wix4.bin</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - Binaries</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -16,17 +16,13 @@ The package contains Wix# binaries only.
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
Expand Down
22 changes: 9 additions & 13 deletions Source/NuGet/WixSharp/WixSharp_wix4.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>WixSharp_wix4</id>
<version>2.1.1.0</version>
<version>2.1.2.0</version>
<title>Wix# (WixSharp) - managed interface for WiX</title>
<authors>Oleg Shilo</authors>
<owners>Oleg Shilo</owners>
Expand All @@ -18,24 +18,20 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
In order to use this package you need have WiX Toolset installed: `dotnet tool install --global wix`
The package is tested against WIX (Windows Installer Xml) Toolset v4.0.1.0</description>
<summary>Wix# (WixSharp) - Binaries</summary>
<releaseNotes>WiX4: Release v2.1.1.0
- Issue #1406: Multi-language improvement
- Issue #1462: ProgressText with WiX 4
- Issue #1463: Unable to find dotnet when building with dotnet cli
- Issue #1460: Add -sw1026 to default Wix4 argument options?
- PR #1461 from klokkenman1/wix-v4-master
Add sw1026 to WixOptions
- Proposal #1456: Using PublishAot instead of SfxCA for custom actions
- Support for CA compiled with .NETCore (AOT)
- Added support for .NET Core projects (pre-release)
See https://github.com/oleg-shilo/wixsharp/blob/wix-v4-master/Source/src/NET-Core
<releaseNotes>WiX4-Release v2.1.2.0
* NetCore: added integration of the NET-Core setup project with NET-Fx UI projectVS infrastructure.
* Issue #1464: Installer crashes when using custom UIs with Features
* Issue #1460: Add -sw1026 to default Wix4 argument options?
* Added `Compiler.SuppressAotWarnings` property
* Issue #1459: ShortCut Icon Tooltip


</releaseNotes>
<copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
<language>en-AU</language>
<tags>C# scripting msi install setup wix</tags>
<dependencies>
<dependency id="WixSharp_wix4.bin" version="2.1.1.0" />
<dependency id="WixSharp_wix4.bin" version="2.1.2.0" />
</dependencies>
</metadata>
<files>
Expand Down
41 changes: 41 additions & 0 deletions Source/bin/set_version.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//css_args
using System.Threading.Tasks;
using System.Threading;
using System;
using System.Diagnostics;

// using System.Windows.Forms;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;

class app
{
static void Main()
{
string version = File.ReadAllLines(@".\..\src\WixSharp\Properties\AssemblyInfo.version.cs")
.First(x => x.Contains("[assembly: AssemblyFileVersion"))
.Split('"')[1];

Console.WriteLine("Current Release: " + version);

version = string.Join(".", version.Split('.').Take(3).ToArray());

Console.WriteLine("NuGet: " + version);
patch_proj_file(@".\..\src\NET-Core\WixSharp.Core\WixSharp.Core.csproj", version);
patch_proj_file(@".\..\src\NET-Core\WixSharp.Msi.Core\WixSharp.Msi.Core.csproj", version);
}

static void patch_proj_file(string file, string version)
{
var lines = File.ReadAllLines(file).Select(x =>
{
if (x.Contains("<PackageVersion>"))
return " <PackageVersion>" + version + "</PackageVersion>";
else
return x;
}).ToArray();
File.WriteAllLines(file, lines);
}
}
7 changes: 5 additions & 2 deletions Source/src/1.build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ rem cleaning WPF bin folders (MSBuild fails to do it)
rd /Q /S .\WixSharp.UI.WPF\obj
rd /Q /S .\WixSharp.UI.WPF\bin

D:\dev\wixsharp-wix4\Source\src\WixSharp.Samples\cscs.exe /l D:\dev\wixsharp-wix4\Source\bin\set_version.cs

PUSHD .
cd .\NET-Core\WixSharp.Core
dotnet publish . -c Release -o ".\out"
Expand All @@ -17,9 +19,10 @@ dotnet publish . -c Release -o ".\out"
dotnet pack WixSharp.Msi.Core.csproj -o .\..\nuget
POPD

set msbuild=C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe
copy .\NET-Core\nuget\*.*nupkg .\..\nuget\WixSharp\

set msbuild=C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe
"%msbuild%" /nologo /verbosity:minimal /t:Clean,Restore,Build /p:Configuration=Release /p:Platform="Any CPU" /p:BuildInParallel=true WixSharp.Suite.sln
rem "%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.Lab.sln


pause
8 changes: 4 additions & 4 deletions Source/src/NET-Core/WixSharp.Core/WixSharp.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand All @@ -13,8 +13,8 @@
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<IncludeSymbols>True</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<FileVersion>2.1.1</FileVersion>
<AssemblyVersion>2.1.1</AssemblyVersion>
<FileVersion>2.1.2</FileVersion>
<AssemblyVersion>2.1.2</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down Expand Up @@ -211,7 +211,7 @@
</ItemGroup>

<PropertyGroup>
<PackageVersion>2.1.1-pre</PackageVersion>
<PackageVersion>2.1.2</PackageVersion>
<Title>WixSharp (.NET Core)</Title>
<Description>.NET Core edition of WixSharp package</Description>
<Copyright>Oleg Shilo</Copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand All @@ -24,7 +24,7 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.1.1-pre</PackageVersion>
<PackageVersion>2.1.2</PackageVersion>
<Title>WixSharp (.NET Core)</Title>
<Description>.NET Core edition of WixSharp.Msi package</Description>
<Copyright>Oleg Shilo</Copyright>
Expand Down
11 changes: 0 additions & 11 deletions Source/src/WixSharp.Suite.sln
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCoreCustomAction", "WixS
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{B8FA0F17-1C07-4511-9FFA-3AD69B36B16C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomUI.Assembly", "WixSharp.Samples\Wix# Samples\Managed Setup\CustomUI.Assembly\CustomUI.Assembly.csproj", "{AA562623-E712-4921-954F-4ED262EA9225}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -989,14 +987,6 @@ Global
{BBAA7E0F-CAC0-4D7B-BCE9-4C5A5C585BD9}.Release|Any CPU.Build.0 = Release|Any CPU
{BBAA7E0F-CAC0-4D7B-BCE9-4C5A5C585BD9}.Release|x86.ActiveCfg = Release|Any CPU
{BBAA7E0F-CAC0-4D7B-BCE9-4C5A5C585BD9}.Release|x86.Build.0 = Release|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Debug|x86.ActiveCfg = Debug|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Debug|x86.Build.0 = Debug|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Release|Any CPU.Build.0 = Release|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Release|x86.ActiveCfg = Release|Any CPU
{AA562623-E712-4921-954F-4ED262EA9225}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1096,7 +1086,6 @@ Global
{810AC5D9-DC9D-4C9B-8BFA-7DE7B7CFAE21} = {B8FA0F17-1C07-4511-9FFA-3AD69B36B16C}
{BBAA7E0F-CAC0-4D7B-BCE9-4C5A5C585BD9} = {B8FA0F17-1C07-4511-9FFA-3AD69B36B16C}
{B8FA0F17-1C07-4511-9FFA-3AD69B36B16C} = {DB40BEF1-64CF-4308-9740-AF22284F4491}
{AA562623-E712-4921-954F-4ED262EA9225} = {DA107019-87B6-473D-8C9B-1C3A48CB8FD5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {559711D5-4429-4577-BBC9-F0D973972079}
Expand Down
10 changes: 5 additions & 5 deletions Source/src/WixSharp.UI/WixSharp.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\bin\WixSharp\$(TargetFileName)"
copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\bin\WixSharp\$(TargetName).xml"
copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetFileName)"
copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetName).xml"
</PostBuildEvent>
copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\bin\WixSharp\$(TargetFileName)"
copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\bin\WixSharp\$(TargetName).xml"
copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetFileName)"
copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetName).xml"
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Loading

0 comments on commit 776b5d8

Please sign in to comment.