Release v1.22.1.0

- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper - Issue #1317: Bootstrapper bundle has bugs on wxs files generation. - Issue #1310: Problem during dynamic localization
oleg-shilo · Jul 22, 2023 · 56d25e9 · 56d25e9
1 parent e2d541f
commit 56d25e9
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 59 deletions.
diff --git a/Source/NuGet/WixSharp/WixSharp.WPF.nuspec b/Source/NuGet/WixSharp/WixSharp.WPF.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.WPF</id>
-    <version>1.22.0.0</version>
+    <version>1.22.1.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,21 +16,16 @@ 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>Release v1.22.0
-- Updated WiX binaries to v3.14.0.6526
-- Updated samples to reflect WiX v3.14.0.6526
-- Updated WixSharp.wix.bin.nuspec
-- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu…
-- Extra u-tests for #270
-- Issue #1300: Weird space sin FeaturesDialog title
-- Issue #1301: Make more elements translatable
-- RC preparation
-- Issues #1304: Improve the  usability of Project.WildCardDedup</releaseNotes>
+    <releaseNotes>Release v1.22.1.0
+- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper
+- Issue #1317: Bootstrapper bundle has bugs on wxs files generation.
+- Issue #1310: Problem during dynamic localization
+</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.bin" version="1.22.0.0" />
+      <dependency id="WixSharp.bin" version="1.22.1.0" />
       <dependency id="Caliburn.Micro" version="3.2.0" />
     </dependencies>
     <references>

diff --git a/Source/NuGet/WixSharp/WixSharp.bin.nuspec b/Source/NuGet/WixSharp/WixSharp.bin.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp.bin</id>
-    <version>1.22.0.0</version>
+    <version>1.22.1.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,16 +16,11 @@ 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>Release v1.22.0
-- Updated WiX binaries to v3.14.0.6526
-- Updated samples to reflect WiX v3.14.0.6526
-- Updated WixSharp.wix.bin.nuspec
-- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu…
-- Extra u-tests for #270
-- Issue #1300: Weird space sin FeaturesDialog title
-- Issue #1301: Make more elements translatable
-- RC preparation
-- Issues #1304: Improve the  usability of Project.WildCardDedup</releaseNotes>
+    <releaseNotes>Release v1.22.1.0
+- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper
+- Issue #1317: Bootstrapper bundle has bugs on wxs files generation.
+- Issue #1310: Problem during dynamic localization
+</releaseNotes>
     <copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>

diff --git a/Source/NuGet/WixSharp/WixSharp.lab.nuspec b/Source/NuGet/WixSharp/WixSharp.lab.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.Lab</id>
-    <version>1.22.0.0</version>
+    <version>1.22.1.0</version>
     <title>Wix# (WixSharp) - Experimantal features</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -14,16 +14,11 @@
 The package contains the sample code for building a simple MSI with the CLR WinForm dialog inserted into UI sequence between InsallDirDlg and VerifyReadyDlg native MSI dialogs. 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# binaries containing experimental features (e.g. native WiX UI support).</summary>
-    <releaseNotes>Release v1.22.0
-- Updated WiX binaries to v3.14.0.6526
-- Updated samples to reflect WiX v3.14.0.6526
-- Updated WixSharp.wix.bin.nuspec
-- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu…
-- Extra u-tests for #270
-- Issue #1300: Weird space sin FeaturesDialog title
-- Issue #1301: Make more elements translatable
-- RC preparation
-- Issues #1304: Improve the  usability of Project.WildCardDedup</releaseNotes>
+    <releaseNotes>Release v1.22.1.0
+- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper
+- Issue #1317: Bootstrapper bundle has bugs on wxs files generation.
+- Issue #1310: Problem during dynamic localization
+</releaseNotes>
     <copyright>Copyright (C) 2008-2023 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# Scripting msi install setup</tags>
@@ -32,7 +27,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
       <frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
     </frameworkAssemblies>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.22.0.0" />
+      <dependency id="WixSharp.bin" version="1.22.1.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/WixSharp.nuspec b/Source/NuGet/WixSharp/WixSharp.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp</id>
-    <version>1.22.0.0</version>
+    <version>1.22.1.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,21 +18,16 @@ 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>Release v1.22.0
-- Updated WiX binaries to v3.14.0.6526
-- Updated samples to reflect WiX v3.14.0.6526
-- Updated WixSharp.wix.bin.nuspec
-- Issue #1297: wixsharp:WpfDialog auto scaling based on screen resolu…
-- Extra u-tests for #270
-- Issue #1300: Weird space sin FeaturesDialog title
-- Issue #1301: Make more elements translatable
-- RC preparation
-- Issues #1304: Improve the  usability of Project.WildCardDedup</releaseNotes>
+    <releaseNotes>Release v1.22.1.0
+- Added Support StoreType.sha1Hash in DigitalSignatureBootstrapper
+- Issue #1317: Bootstrapper bundle has bugs on wxs files generation.
+- Issue #1310: Problem during dynamic localization
+</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.bin" version="1.22.0.0" />
+      <dependency id="WixSharp.bin" version="1.22.1.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Source/NuGet/WixSharp/build.cmd b/Source/NuGet/WixSharp/build.cmd
@@ -2,5 +2,5 @@ nuget pack WixSharp.bin.nuspec
 nuget pack WixSharp.lab.nuspec
 nuget pack WixSharp.WPF.nuspec
 nuget pack WixSharp.nuspec
-nuget pack WixSharp.wix.bin.nuspec
+rem nuget pack WixSharp.wix.bin.nuspec
 pause
diff --git a/Source/NuGet/WixSharp/readme.md b/Source/NuGet/WixSharp/readme.md
@@ -1,4 +1,4 @@
-In order to builk the packages executhe the following steps:
+In order to build the packages execute the following steps:
 - Update the files to be included in the package
   ```
   css updatepackage

diff --git a/Source/bin/package.readme b/Source/bin/package.readme
@@ -2,5 +2,5 @@
 
 2.1 Execute src\build.cmd              (Builds all solutions)
 2.2 Execute src\aggregate
-
+3.  Follow  NuGet\WixSharp\readme.md
 
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/DeferredActions/setup.cs
@@ -2,6 +2,7 @@
 //css_ref Wix_bin\SDK\Microsoft.Deployment.WindowsInstaller.dll;
 //css_ref System.Core.dll;
 //css_ref System.Xml.dll;
+using Microsoft.Deployment.WindowsInstaller;
 using System;
 using System.Configuration;
 using System.Diagnostics;
@@ -10,7 +11,6 @@
 using System.Windows.Forms;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp;
 using WixSharp.CommonTasks;
 using IO = System.IO;

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi b/Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/ManagedSetup.msi
diff --git a/...ixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj b/...ixSharp.Samples/Wix# Samples/Managed Setup/Self-executable_Msi/Self-executable_Msi.csproj
@@ -109,8 +109,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
+    <PreBuildEvent>IF EXIST "$(ProjectDir)ManagedSetup.msi" (
+  echo "ManagedSetup.msi already exists..."
+) ELSE (
+  "$(ProjectDir)..\..\..\cscs.exe" /l /d "$(ProjectDir)ManagedSetup.msi.cs"
+)
+</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>copy "$(TargetPath)" "$(ProjectDir)ManagedSetup.exe"</PostBuildEvent>

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd b/Source/src/WixSharp.Samples/Wix# Samples/OnStartUpAction/Build.cmd
@@ -1,2 +1,2 @@
 ..\..\cscs.exe setup.cs
-pause
+rem pause
diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.xml b/Source/src/WixSharp.Samples/WixSharp.UI.xml
diff --git a/Source/src/WixSharp/Compiler.Bootstrapper.cs b/Source/src/WixSharp/Compiler.Bootstrapper.cs
@@ -301,9 +301,9 @@ public static string BuildWxs(Bundle project)
                         var wixNamespace = Compiler.IsWix4 ? wix4Namespace : wix3Namespace;
 
                         var doc = XDocument.Parse(
-                                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                            @"<?xml version=""1.0"" encoding=""utf-8""?>
                              " + $"<Wix xmlns=\"{wixNamespace}\" {extraNamespaces} " + @" >
-                        </Wix>");
+                             </Wix>");
 
                         doc.Root.Add(project.ToXml());
 

diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs
@@ -7,5 +7,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.22.0.0")]
-[assembly: AssemblyFileVersion("1.22.0.0")]
+[assembly: AssemblyVersion("1.22.1.0")]
+[assembly: AssemblyFileVersion("1.22.1.0")]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,5 @@

		2.1 Execute src\build.cmd (Builds all solutions)
		2.2 Execute src\aggregate

		3. Follow NuGet\WixSharp\readme.md