Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 78845eb

Browse files
Evar SmithEvar Smith
Evar Smith
authored and
Evar Smith
committed
Updated versioning to 1.4.6
1 parent 0058005 commit 78845eb

3 files changed

Lines changed: 14 additions & 26 deletions

File tree

‎TISFAT.Installer/Fragments/FilesFragment.wxs‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,42 @@
33
<?include $(sys.CURRENTDIR)Fragments\config_Wix.wxi?>
44
<Fragment>
55
<DirectoryRef Id="INSTALLFOLDER">
6-
<Component Id="cmpB8C0EBDE7DE2CC411B550EDFBA85C027" Guid="{AEE9F5C1-CBBF-46D1-9353-9D56A139C825}" Win64="yes">
6+
<Component Id="cmpB8C0EBDE7DE2CC411B550EDFBA85C027" Guid="{1B2CFD9B-0582-4E60-92B7-2A05D2177317}" Win64="no">
77
<File Id="fil21F629ADBC39520BE5C85640CE00209B" KeyPath="yes" Source="$(var.BinDirectory)\Cyotek.Windows.Forms.ColorPicker.dll" />
88
</Component>
9-
<Component Id="cmp5097CAF52967A6CF76C81E53F4DD535C" Guid="{9420FDCE-41B8-4E5B-9B19-5D2979AE3A80}" Win64="yes">
9+
<Component Id="cmp5097CAF52967A6CF76C81E53F4DD535C" Guid="{64C6D637-80E4-402F-BB06-F0F3DD19DB20}" Win64="no">
1010
<File Id="fil288D72DC7A0E11135BBE918AEA1D3A82" KeyPath="yes" Source="$(var.BinDirectory)\ffmpeg.exe" />
1111
</Component>
12-
<Component Id="cmp2D910AE3FB01D8D6898D22BF742CCA9C" Guid="{DA7C90AE-3CEC-438E-8D4F-9C3702449FB4}" Win64="yes">
12+
<Component Id="cmp2D910AE3FB01D8D6898D22BF742CCA9C" Guid="{3682D093-091E-4E70-9DE3-0B196FE45703}" Win64="no">
1313
<File Id="fil04E1DDC65DABABE0F39C79667CA014CD" KeyPath="yes" Source="$(var.BinDirectory)\OpenTK.dll" />
1414
</Component>
15-
<Component Id="cmp87F301ED03A0753CE9EE6AB4F07FC4F6" Guid="{D28814CD-A08A-442E-8EAE-473282E4DD38}" Win64="yes">
15+
<Component Id="cmp87F301ED03A0753CE9EE6AB4F07FC4F6" Guid="{22EDD8CC-435D-4614-BD33-482BD1163E59}" Win64="no">
1616
<File Id="fil6FD05457390B511FB20295E9898EEA9F" KeyPath="yes" Source="$(var.BinDirectory)\OpenTK.GLControl.dll" />
1717
</Component>
18-
<Component Id="cmpAD877564A65C79E2584096605D7BB46A" Guid="{9E9D8F96-93FD-4170-A677-666C7042FA48}" Win64="yes">
18+
<Component Id="cmpAD877564A65C79E2584096605D7BB46A" Guid="{9F97BA81-AB8A-48A2-BA86-56E3A50D8F71}" Win64="no">
1919
<File Id="fil2FF35CAD3A5C646910F13166D01170B6" KeyPath="yes" Source="$(var.BinDirectory)\OpenTK.xml" />
2020
</Component>
21-
<Component Id="cmp9C92424AB720D958633C387CCD4C54FE" Guid="{A62B40D5-FF81-491B-9411-CD292AA5A923}" Win64="yes">
21+
<Component Id="cmp9C92424AB720D958633C387CCD4C54FE" Guid="{B61ED07B-2FAD-4184-ACF1-E0683E238088}" Win64="no">
2222
<Shortcut Id="scDesktopIcon" Advertise="yes" Directory="DesktopFolder" Icon="TISFAT_Icon.exe" Name="TISFAT Zero" WorkingDirectory="INSTALLFOLDER" />
2323
<Shortcut Id="scStartIcon" Advertise="yes" Directory="TISFATStartMenuFolder" Icon="TISFAT_Icon.exe" Name="TISFAT Zero" WorkingDirectory="INSTALLFOLDER" />
2424
<RemoveFolder Id="RemoveStartMenuFolder" Directory="TISFATStartMenuFolder" On="uninstall" />
2525

2626
<File Id="filFB2232F322FA11A8A804E01365010A67" KeyPath="yes" Source="$(var.BinDirectory)\TISFAT.exe" />
2727
</Component>
28-
<Component Id="cmpBEFBC61235BA255EBDFA0133025AB7DE" Guid="{8D16CD23-968F-4982-A15F-8747FA12BA2E}" Win64="yes">
28+
<Component Id="cmpBEFBC61235BA255EBDFA0133025AB7DE" Guid="{4C570122-87F3-4782-9A0B-1BD5CD3BAF26}" Win64="no">
2929
<File Id="filE70E2EDA7B78AA3ABAD60D186598E51B" KeyPath="yes" Source="$(var.BinDirectory)\TISFAT.exe.config" />
3030
</Component>
31-
<Component Id="cmp36BD1610BDE87709095F34D9C517B07E" Guid="{8A8DDDD2-BC10-4BA8-A3B0-DF4D4E699DF2}" Win64="yes">
32-
<File Id="filB83BB94CACF708033770815C9B01C833" KeyPath="yes" Source="$(var.BinDirectory)\TISFAT.vshost.exe" />
33-
</Component>
34-
<Component Id="cmp774B240A26A1A1EA6BBF7B5DA015423D" Guid="{E86BD150-9ED4-411C-92C8-ECDA32C5D19C}" Win64="yes">
35-
<File Id="filC22A4DA9B8AD3DCF512DADDE55FC7FAF" KeyPath="yes" Source="$(var.BinDirectory)\TISFAT.vshost.exe.config" />
36-
</Component>
37-
<Component Id="cmpA806ED25278A54CD6F7986BAD1453213" Guid="{69FAFF7E-1AA5-4936-A689-08197B974061}" Win64="yes">
38-
<File Id="filC266603CDCBA3B96BA2EA0A74152036A" KeyPath="yes" Source="$(var.BinDirectory)\TISFAT.vshost.exe.manifest" />
39-
</Component>
4031
<Directory Id="dirE9BACA1759D12D11018357DC8AB0F0CF" Name="Shaders">
41-
<Component Id="cmp9BAFF94E331EE8CDC500567776E9AC3C" Guid="{18AC8173-9166-4600-847E-A321C7EF312E}" Win64="yes">
32+
<Component Id="cmp9BAFF94E331EE8CDC500567776E9AC3C" Guid="{73F5FCA1-6A04-486A-8809-4E193B41A152}" Win64="no">
4233
<File Id="filA24E20BAF69058F74FC3928E1CF28FA6" KeyPath="yes" Source="$(var.BinDirectory)\Shaders\ColorPicker.frag" />
4334
</Component>
44-
<Component Id="cmp2C1CBDCD3C96C069265EDB8010EAE245" Guid="{6E2291CA-D62D-464D-BD59-C02ADBE3C66B}" Win64="yes">
35+
<Component Id="cmp2C1CBDCD3C96C069265EDB8010EAE245" Guid="{6C5100E5-4CC2-470F-A845-C4DC1E949BC9}" Win64="no">
4536
<File Id="fil22FE314723941D6F2FD0F7BD01F11ED7" KeyPath="yes" Source="$(var.BinDirectory)\Shaders\ColorPicker.vert" />
4637
</Component>
47-
<Component Id="cmp8C2B46036FF23F2B0B895B661479E2DA" Guid="{838B3C9A-FD72-40B4-ACCD-4474DBBF9422}" Win64="yes">
38+
<Component Id="cmp8C2B46036FF23F2B0B895B661479E2DA" Guid="{6CFD1FC5-5F24-476E-BD3D-C261CF88108D}" Win64="no">
4839
<File Id="fil0014BE2A1AE5FA2D9A1E6B5269F3B425" KeyPath="yes" Source="$(var.BinDirectory)\Shaders\PointLight.frag" />
4940
</Component>
50-
<Component Id="cmpDA47FB051434A13172B6EAF3BD139D22" Guid="{2A0F8DA6-DB22-4D5C-80F3-E07849F06B35}" Win64="yes">
41+
<Component Id="cmpDA47FB051434A13172B6EAF3BD139D22" Guid="{507496CD-F41E-4C9B-9710-5A9E66804787}" Win64="no">
5142
<File Id="filED9BBE822807671EA67253C04EEBBD99" KeyPath="yes" Source="$(var.BinDirectory)\Shaders\PointLight.vert" />
5243
</Component>
5344
</Directory>
@@ -62,9 +53,6 @@
6253
<ComponentRef Id="cmpAD877564A65C79E2584096605D7BB46A" />
6354
<ComponentRef Id="cmp9C92424AB720D958633C387CCD4C54FE" />
6455
<ComponentRef Id="cmpBEFBC61235BA255EBDFA0133025AB7DE" />
65-
<ComponentRef Id="cmp36BD1610BDE87709095F34D9C517B07E" />
66-
<ComponentRef Id="cmp774B240A26A1A1EA6BBF7B5DA015423D" />
67-
<ComponentRef Id="cmpA806ED25278A54CD6F7986BAD1453213" />
6856
<ComponentRef Id="cmp9BAFF94E331EE8CDC500567776E9AC3C" />
6957
<ComponentRef Id="cmp2C1CBDCD3C96C069265EDB8010EAE245" />
7058
<ComponentRef Id="cmp8C2B46036FF23F2B0B895B661479E2DA" />

‎TISFAT.Installer/Fragments/config_Wix.wxi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- Versioning. These must be changed for upgrades.
2626
Recompiling with newer files isn't enough -->
2727

28-
<?define VersionNumber="1.4.5.0" ?>
28+
<?define VersionNumber="1.4.6.0" ?>
2929

3030
<?define UpgradeCode="BAEE4265-CA67-4FE3-9626-3E2CCE77FF16"?>
3131

‎TISFAT/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.4.5.0")]
36-
[assembly: AssemblyFileVersion("1.4.5.0")]
35+
[assembly: AssemblyVersion("1.4.6.0")]
36+
[assembly: AssemblyFileVersion("1.4.6.0")]

0 commit comments

Comments
 (0)