Skip to content

Commit 43cb839

Browse files
RobertvanderHulstRobertvanderHulst
committed
Version 2.14.0.4
1 parent 05043fa commit 43cb839

File tree

7 files changed

+544
-536
lines changed

7 files changed

+544
-536
lines changed

‎Tests/xSharp Tests.viproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -115296,8 +115296,8 @@ IDEVersion = 1.06
115296115296
GalleryName =
115297115297
GalleryPage =
115298115298
GalleryDefaultName =
115299-
Target = 2
115300-
Platform = AnyCPU
115299+
Target = 0
115300+
Platform = x86
115301115301
Language = XSharp
115302115302
Runtime = CLR4
115303115303
Dialect = VO
@@ -115332,8 +115332,9 @@ FileType = Code
115332115332
CopyToBin = 0
115333115333
[Tester References]
115334115334
ReferenceGAC = CLR4,System,1,0,4.0.0.0
115335-
ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.Core.dll,1,0
115336-
ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.RT.dll,1,0
115335+
ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.Core.dll,1,1
115336+
ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.RT.dll,1,1
115337+
ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.MacroCompiler.dll,1,1
115337115338
[Tester Resources]
115338115339
[Tester Native Resources]
115339115340
[Tester License files]
@@ -116933,8 +116934,8 @@ FileType = Code
116933116934
CopyToBin = 0
116934116935
[C875 - MemVars created inside macros do not continue to exist after macro execution References]
116935116936
ReferenceGAC = CLR4,System,1,0,4.0.0.0
116936-
ReferenceGAC = CLR4,XSharp.Core,1,0,2.6.0.0
116937-
ReferenceGAC = CLR4,XSharp.RT,1,0,2.6.0.0
116937+
ReferenceGAC = XSharp.Core,1,0,2.6.0.0
116938+
ReferenceGAC = XSharp.RT,1,0,2.6.0.0
116938116939
[C875 - MemVars created inside macros do not continue to exist after macro execution Resources]
116939116940
[C875 - MemVars created inside macros do not continue to exist after macro execution Native Resources]
116940116941
[C875 - MemVars created inside macros do not continue to exist after macro execution License files]

‎XSharp/docs/Topics/Acknowledgements.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?xml-stylesheet type="text/xsl" href="../helpproject.xsl" ?>
3-
<topic template="Default" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
3+
<topic template="Default" modified="2022-12-02T19:15:35.803+01:00" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
44
<title>Acknowledgements</title>
55
<body>
66
<header>
@@ -48,15 +48,15 @@
4848
<para styleclass="Body Text">Nemerle</para>
4949
</td>
5050
<td>
51-
<para styleclass="Body Text">The project system for Nemerle. We have been inspired by some of the solutions in their project system. We would like to thank the authors of Nemerle for showing us how to solve certain problems. (<link displaytype="text" defaultstyle="true" type="weblink" href="&lt;%LINK_CAPTION%&gt;" target="_blank">www.nemerle.org</link>)</para>
51+
<para styleclass="Body Text">The project system for Nemerle. We have been inspired by some of the solutions in their project system. We would like to thank the authors of Nemerle for showing us how to solve certain problems. (<link displaytype="text" defaultstyle="true" type="weblink" href="http://www.nemerle.org" target="_blank">www.nemerle.org</link>)</para>
5252
</td>
5353
</tr>
5454
<tr style="vertical-align:top">
5555
<td>
5656
<para styleclass="Body Text">F# project system</para>
5757
</td>
5858
<td>
59-
<para styleclass="Body Text">The visual F# project system (<link displaytype="text" defaultstyle="true" type="weblink" href="http://www.fsharp.org" target="_blank">www.fsharp.org</link><link displaytype="text" defaultstyle="true" type="weblink" href="&lt;%LINK_CAPTION%&gt;" target="_blank">/</link>)</para>
59+
<para styleclass="Body Text">The visual F# project system (<link displaytype="text" defaultstyle="true" type="weblink" href="http://www.fsharp.org" target="_blank">www.fsharp.org)</link></para>
6060
</td>
6161
</tr>
6262
<tr style="vertical-align:top">

‎XSharp/docs/Topics/VersionHistory.xml

+527-520
Large diffs are not rendered by default.

‎XSharp/docs/XSHelp.hmxp

+2-2
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@
642642
<config-group name="user">
643643
<config-group name="robert">
644644
<config-group name="project">
645-
<config-value name="lastexport">3</config-value>
645+
<config-value name="lastexport">0</config-value>
646646
</config-group>
647647
<config-group name="report">
648648
<config-value name="type">6</config-value>
@@ -705,7 +705,7 @@
705705
<config-value name="template">$(HMSYS)Templates\Word\Word-Template-Simple-A4.docx</config-value>
706706
</config-group>
707707
<variables>
708-
<variable id="TXTVERSION" type="text" translate="true">Cahors (2.14.0.0)</variable>
708+
<variable id="TXTVERSION" type="text" translate="true">Cahors (2.14.0.4)</variable>
709709
<variable id="APP" type="text" translate="true">XSharp</variable>
710710
</variables>
711711
<helpcontext-numbers/>

‎XSharp/eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See License.txt in the project root for license information.
1414
<MajorVersion>2</MajorVersion>
1515
<MinorVersion>14</MinorVersion>
1616
<PatchVersion>0</PatchVersion>
17-
<PreReleaseVersionLabel>2</PreReleaseVersionLabel>
17+
<PreReleaseVersionLabel>4</PreReleaseVersionLabel>
1818
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1919
<!--
2020
By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

‎XSharp/src/Common/BuildNumber.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#ifdef RUNTIME
1414
#define VERSION_NUMBER "2.6.0.0"
1515
#else
16-
#define VERSION_NUMBER "2.14.0.2"
16+
#define VERSION_NUMBER "2.14.0.4"
1717
#endif
1818

1919
// This is the file version number, which is ignored by .NET but used by Windows installer to determine
2020
// whether one file is newer than another.
2121
// This typically would change if we're generating a patch, otherwise it should be the same as VERSION_NUMBER
22-
#define FILEVERSION_NUMBER "2.14.0.2"
22+
#define FILEVERSION_NUMBER "2.14.0.4"
2323
#define INFORMATIONAL_NUMBER "2.14 GA"
2424

2525
#ifdef __DEBUG__

‎XSharp/src/Common/Constants.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ internal class Constants
1616
#if RUNTIME
1717
internal const string Version = "2.6.0.0";
1818
#else
19-
internal const string Version = "2.14.0.2";
19+
internal const string Version = "2.14.0.4";
2020
#endif
21-
internal const string FileVersion = "2.14.0.2";
21+
internal const string FileVersion = "2.14.0.4";
2222
internal const string ProductVersion = "2.14 GA";
2323
internal const string PublicKey = "ed555a0467764586";
2424
internal const string Copyright = "Copyright © XSharp BV 2015-2022";

0 commit comments

Comments
 (0)