Version 2.14.0.4

X-Sharp · Dec 5, 2022 · 43cb839 · 43cb839
1 parent 05043fa
commit 43cb839
Show file tree

Hide file tree

Showing 7 changed files with 544 additions and 536 deletions.
diff --git a/Tests/xSharp Tests.viproj b/Tests/xSharp Tests.viproj
@@ -115296,8 +115296,8 @@ IDEVersion = 1.06
 GalleryName = 
 GalleryPage = 
 GalleryDefaultName = 
-Target = 2
-Platform = AnyCPU
+Target = 0
+Platform = x86
 Language = XSharp
 Runtime = CLR4
 Dialect = VO
@@ -115332,8 +115332,9 @@ FileType = Code
 CopyToBin = 0
 [Tester References]
 ReferenceGAC = CLR4,System,1,0,4.0.0.0
-ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.Core.dll,1,0
-ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.RT.dll,1,0
+ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.Core.dll,1,1
+ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.RT.dll,1,1
+ReferenceBrowse = C:\XSharp\DevRt\Binaries\Debug\XSharp.MacroCompiler.dll,1,1
 [Tester Resources]
 [Tester Native Resources]
 [Tester License files]
@@ -116933,8 +116934,8 @@ FileType = Code
 CopyToBin = 0
 [C875 - MemVars created inside macros do not continue to exist after macro execution References]
 ReferenceGAC = CLR4,System,1,0,4.0.0.0
-ReferenceGAC = CLR4,XSharp.Core,1,0,2.6.0.0
-ReferenceGAC = CLR4,XSharp.RT,1,0,2.6.0.0
+ReferenceGAC = XSharp.Core,1,0,2.6.0.0
+ReferenceGAC = XSharp.RT,1,0,2.6.0.0
 [C875 - MemVars created inside macros do not continue to exist after macro execution Resources]
 [C875 - MemVars created inside macros do not continue to exist after macro execution Native Resources]
 [C875 - MemVars created inside macros do not continue to exist after macro execution License files]

diff --git a/XSharp/docs/Topics/Acknowledgements.xml b/XSharp/docs/Topics/Acknowledgements.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../helpproject.xsl" ?>
-<topic template="Default" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
+<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">
   <title>Acknowledgements</title>
   <body>
     <header>
@@ -48,15 +48,15 @@
           <para styleclass="Body Text">Nemerle</para>
         </td>
         <td>
-          <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>
+          <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>
         </td>
       </tr>
       <tr style="vertical-align:top">
         <td>
           <para styleclass="Body Text">F# project system</para>
         </td>
         <td>
-          <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>
+          <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>
         </td>
       </tr>
       <tr style="vertical-align:top">

diff --git a/XSharp/docs/Topics/VersionHistory.xml b/XSharp/docs/Topics/VersionHistory.xml
diff --git a/XSharp/docs/XSHelp.hmxp b/XSharp/docs/XSHelp.hmxp
@@ -642,7 +642,7 @@
     <config-group name="user">
       <config-group name="robert">
         <config-group name="project">
-          <config-value name="lastexport">3</config-value>
+          <config-value name="lastexport">0</config-value>
         </config-group>
         <config-group name="report">
           <config-value name="type">6</config-value>
@@ -705,7 +705,7 @@
       <config-value name="template">$(HMSYS)Templates\Word\Word-Template-Simple-A4.docx</config-value>
     </config-group>
     <variables>
-      <variable id="TXTVERSION" type="text" translate="true">Cahors (2.14.0.0)</variable>
+      <variable id="TXTVERSION" type="text" translate="true">Cahors (2.14.0.4)</variable>
       <variable id="APP" type="text" translate="true">XSharp</variable>
     </variables>
     <helpcontext-numbers/>

diff --git a/XSharp/eng/Versions.props b/XSharp/eng/Versions.props
@@ -14,7 +14,7 @@ See License.txt in the project root for license information.
     <MajorVersion>2</MajorVersion>
     <MinorVersion>14</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>2</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>4</PreReleaseVersionLabel>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <!--
       By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

diff --git a/XSharp/src/Common/BuildNumber.h b/XSharp/src/Common/BuildNumber.h
@@ -13,13 +13,13 @@
 #ifdef RUNTIME
     #define VERSION_NUMBER     "2.6.0.0"
 #else
-    #define VERSION_NUMBER     "2.14.0.2"
+    #define VERSION_NUMBER     "2.14.0.4"
 #endif
 
     // This is the file version number, which is ignored by .NET but used by Windows installer to determine
     // whether one file is newer than another.
     // This typically would change if we're generating a patch, otherwise it should be the same as VERSION_NUMBER
-    #define FILEVERSION_NUMBER   "2.14.0.2"
+    #define FILEVERSION_NUMBER   "2.14.0.4"
     #define INFORMATIONAL_NUMBER  "2.14 GA"
 
     #ifdef __DEBUG__

diff --git a/XSharp/src/Common/Constants.cs b/XSharp/src/Common/Constants.cs
@@ -16,9 +16,9 @@ internal class Constants
 #if RUNTIME
         internal const string Version = "2.6.0.0";
 #else
-        internal const string Version = "2.14.0.2";
+        internal const string Version = "2.14.0.4";
 #endif
-        internal const string FileVersion = "2.14.0.2";
+        internal const string FileVersion = "2.14.0.4";
         internal const string ProductVersion = "2.14 GA";
         internal const string PublicKey = "ed555a0467764586";
         internal const string Copyright = "Copyright © XSharp BV 2015-2022";