Merge branch 'dev'

iswix-llc · Nov 16, 2022 · c988084 · c988084
2 parents 7780aaa + b2f1b84
commit c988084
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/Application/Designers/AppXDesigner/License.txt b/Application/Designers/AppXDesigner/License.txt
@@ -1,10 +1,10 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
 
 Third Party Code:
 
 FireGiant WiX Expansion Pack - Schema Definitions
-Author: FireGiant LLC
+Author: FireGiant
 WebSite: https://www.firegiant.com/products/wix-expansion-pack/
 
 License:

diff --git a/Application/Designers/CustomTablesDesigner/License.txt b/Application/Designers/CustomTablesDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/FeaturesDesigner/License.txt b/Application/Designers/FeaturesDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/FilesAndFoldersDesigner/License.txt b/Application/Designers/FilesAndFoldersDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/GeneralInformationDesigner/License.txt b/Application/Designers/GeneralInformationDesigner/License.txt
@@ -1,4 +1,4 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
 
 Third Party Code:
@@ -10,9 +10,9 @@ License:
   Microsoft Public License (MS-PL)
   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
-Windows Installer XML - Deployment Tools Framework
+WiXToolset - Deployment Tools Framework
 Author: .NET Foundation and contributors
-WebSite: https://github.com/wixtoolset/wix3
+WebSite: https://github.com/wixtoolset/
 License:
   Microsoft Reciprocal License (MS-RL)
-  https://github.com/wixtoolset/wix3/blob/develop/LICENSE.TXT
+  https://github.com/wixtoolset/wix4/blob/develop/LICENSE.TXT
diff --git a/Application/Designers/MSIXDesigner/License.txt b/Application/Designers/MSIXDesigner/License.txt
@@ -1,10 +1,10 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
 
 Third Party Code:
 
 FireGiant WiX Expansion Pack - Schema Definitions
-Author: FireGiant LLC
+Author: FireGiant
 WebSite: https://www.firegiant.com/products/wix-expansion-pack/
 
 License:

diff --git a/Application/Designers/NamespacesDesigner/License.txt b/Application/Designers/NamespacesDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/PropertiesDesigner/License.txt b/Application/Designers/PropertiesDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/ServicesDesigner/License.txt b/Application/Designers/ServicesDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/Designers/ShortCutsDesigner/License.txt b/Application/Designers/ShortCutsDesigner/License.txt
@@ -1,2 +1,2 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
diff --git a/Application/IsWiX/EULA.rtf b/Application/IsWiX/EULA.rtf
@@ -42,7 +42,7 @@ Normal Table;}}{\*\rsidtbl \rsid3676497\rsid12286749}{\mmathPr\mmathFont34\mbrkB
 \pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6
 \pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
 {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {
-\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid3676497 \hich\af1\dbch\af31505\loch\f1 Copyright 2019 \loch\af1\dbch\af31505\hich\f1 \endash \hich\af1\dbch\af31505\loch\f1  ISWIX \hich\af1\dbch\af31505\loch\f1 LLC
+\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid3676497 \hich\af1\dbch\af31505\loch\f1 Copyright 2022 \loch\af1\dbch\af31505\hich\f1 \endash \hich\af1\dbch\af31505\loch\f1  ISWIX \hich\af1\dbch\af31505\loch\f1 LLC
 \par }{\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid12286749 
 \par \hich\af1\dbch\af31505\loch\f1 Microsoft Public License (MS-PL)
 \par \hich\af1\dbch\af31505\loch\f1  

diff --git a/Application/IsWiX/License.txt b/Application/IsWiX/License.txt
@@ -1,12 +1,12 @@
-Copyright 2010 - 2019 - ISWIX, LLC
+Copyright 2010 - 2022 - ISWIX, LLC
 Microsoft Public License (MS-PL)
 
 Third Party Code:
 
-Windows Installer XML - Schema Definitions
+WiX Toolset - Schema Definitions
 Author: .NET Foundation and contributors
-WebSite: https://github.com/wixtoolset/wix3
+WebSite: https://github.com/wixtoolset/
 
 License:
   Microsoft Reciprocal License (MS-RL)
-  https://github.com/wixtoolset/wix3/blob/develop/LICENSE.TXT
+  https://github.com/wixtoolset/wix4/blob/develop/LICENSE.TXT
diff --git a/Installer/IsWiX/Resources/EULA.rtf b/Installer/IsWiX/Resources/EULA.rtf