Skip to content

Commit ba8aa2c

Browse files
RobertvanderHulstcpyrgas
RobertvanderHulst
and
cpyrgas
authored
Dev (#1737)
* Update runtime for tests * [Docs] Updated Version History * Fix debugging problem in VS 2017 and VS 2019 by adjusting the versions of System.Collections.Immutable & System.Reflection.Metadata * [doc] Updates * Add missing projects to Tools solution to make sure that they are compiled with the right version number --------- Co-authored-by: cpyrgas <[email protected]>
1 parent 6fba2ea commit ba8aa2c

File tree

22 files changed

+742
-719
lines changed

22 files changed

+742
-719
lines changed

‎docs/Help/Topics/VersionHistory.xml‎

Lines changed: 10 additions & 2 deletions
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" modified="2025-06-25T16:17:53.385+03:00" lasteditedby="cpc" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
3+
<topic template="Default" modified="2025-07-02T15:54:07.546+02:00" lasteditedby="robert" version="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../helpproject.xsd">
44
<title>Version History</title>
55
<keywords>
66
<keyword>Changes</keyword>
@@ -12,7 +12,7 @@
1212
<para styleclass="Heading1">Version History</para>
1313
</header>
1414
<para styleclass="Body Text">Note: When an item has a matching GitHub ticket, the ticket number is behind the item in parentheses prefixed with #. You can find these tickets by going to: <br/>https://github.com/X-Sharp/XSharpPublic/issues/<text style="font-weight:bold;">nnn</text> , where <text style="font-weight:bold;">nnn</text> is the ticket number.<br/>If you find an issue in X#, we recommend that you report it on GitHub. You will be notified of the progress on the work on your issue.</para>
15-
<para styleclass="Heading1">Changes in 2.24.0.0</para>
15+
<para styleclass="Heading1">Changes in 2.24.0.1</para>
1616
<para styleclass="Heading1"><text styleclass="Heading2">Compiler</text><br/><text styleclass="Heading3">Bug fixes</text></para>
1717
<list id="0" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Normal" style="font-family:Symbol; font-size:11pt; color:#000000;">
1818
<li styleclass="Normal">Documentation generation for VFP classes for members without visibility modifier was not working (#1664)</li>
@@ -35,6 +35,7 @@
3535
<li styleclass="Body Text">Intellisense was not showing field in VFP classes for fields without visibility modifier (#1725)</li>
3636
<li styleclass="Body Text">The ToggleLineComment and ToggleBlockComment functions were not properly maintaining leading whitespace (#1728)</li>
3737
<li styleclass="Body Text">Fixed an issue with Code Generation for AssemblyCustomAttributes</li>
38+
<li styleclass="Body Text">Fixed a problem with the Debugger Expression Evaluator in VS 2017 and VS 2019</li>
3839
</list>
3940
<para styleclass="Heading3">New Features</para>
4041
<list id="1" type="ul" listtype="bullet" formatstring="&#183;" format-charset="SYMBOL_CHARSET" levelreset="true" legalstyle="false" startfrom="1" styleclass="Body Text" style="font-family:Symbol; font-size:11pt; color:#000000;">
@@ -54,6 +55,13 @@
5455
<li styleclass="Normal">Fixed problem with new applications defaulting to CLR2 when no gallery template is used</li>
5556
<li styleclass="Normal">Added folder button for &quot;App to run&quot; option in th application properties window</li>
5657
<li styleclass="Normal">Added several &quot;Tip of the day&quot; items</li>
58+
<li styleclass="Normal">Added Preferences/Highlight active file caption option</li>
59+
<li styleclass="Normal">Added Preferences/Paint file captions per application option</li>
60+
<li styleclass="Normal">Added keyboard shortcut information to the File-&gt;Navigate menu items</li>
61+
<li styleclass="Normal">Added &quot;Dock To Pane&quot; options to tab page context menu of toolwindows</li>
62+
<li styleclass="Normal">Added Detach/Attach to main IDE window context menu options for editor files</li>
63+
<li styleclass="Normal">Added regular context menu options also for files in floating windows</li>
64+
<li styleclass="Normal">Toolwindows can now be closed also with middle mouse button click</li>
5765
</list>
5866
<para styleclass="Heading1">Changes in 2.23.0.2</para>
5967
<para styleclass="Heading1"><text styleclass="Heading2">Compiler</text></para>

‎docs/Help_ZH-CN/Topics/VersionHistory.xml‎

Lines changed: 654 additions & 651 deletions
Large diffs are not rendered by default.

‎src/Common/BuildNumber.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// This is the file version number, which is ignored by .NET but used by Windows installer to determine
1111
// whether one file is newer than another.
1212
// This typically would change if we're generating a patch, otherwise it should be the same as VERSION_NUMBER
13-
#define FILEVERSION_NUMBER "2.24.0.0"
13+
#define FILEVERSION_NUMBER "2.24.0.1"
1414
// This is used for the assembly version number, which the CLR uses to determine binding
1515
// This generally changes when we release a new full build
1616
// NOTE: DO NOT FORGET THE VERSION NUMBER IN THE CONSTANTS.CS FILE and the Versions.Props file

‎src/Common/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal static partial class Constants
1818
#else
1919
internal const string Version = FileVersion;
2020
#endif
21-
internal const string FileVersion = "2.24.0.0";
21+
internal const string FileVersion = "2.24.0.1";
2222
internal const string ProductVersion = "2.24 GA";
2323
internal const string PublicKey = "ed555a0467764586";
2424
internal const string Copyright = "Copyright © XSharp BV 2015-2025";

‎src/Compiler/eng/Versions.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ See License.txt in the project root for license information.
1313
<PropertyGroup>
1414
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1515
<MajorVersion>2</MajorVersion>
16-
<MinorVersion>23</MinorVersion>
16+
<MinorVersion>24</MinorVersion>
1717
<PatchVersion>0</PatchVersion>
1818
<PreReleaseVersionLabel>1</PreReleaseVersionLabel>
1919
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
@@ -219,9 +219,9 @@ See License.txt in the project root for license information.
219219
<SystemIOPipesAccessControlVersion>4.5.1</SystemIOPipesAccessControlVersion>
220220
<SystemIOPipelinesVersion>5.0.0</SystemIOPipelinesVersion>
221221
<SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>
222-
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
222+
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
223223
<SystemResourcesExtensionsVersion>4.7.1</SystemResourcesExtensionsVersion>
224-
<SystemRuntimeCompilerServicesUnsafeVersion>5.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
224+
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
225225
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
226226
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
227227
<SystemTextEncodingCodePagesVersion>4.5.1</SystemTextEncodingCodePagesVersion>
@@ -266,11 +266,12 @@ See License.txt in the project root for license information.
266266
When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they
267267
can update to the same version. Version changes require a VS test insertion for validation.
268268
-->
269-
<SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
270-
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
269+
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
270+
<SystemReflectionMetadataVersion>7.0.1</SystemReflectionMetadataVersion>
271271
<MicrosoftBclAsyncInterfacesVersion>5.0.0</MicrosoftBclAsyncInterfacesVersion>
272272
</PropertyGroup>
273273
<PropertyGroup>
274+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
274275
<UsingToolPdbConverter>true</UsingToolPdbConverter>
275276
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
276277
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>

‎src/Compiler/src/Compiler/XSFullMacroCompiler/FullMacroCompiler.xsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
8484
<ItemGroup>
8585
<PackageReference Include="System.Collections.Immutable">
86-
<Version>5.0.0</Version>
86+
<Version>7.0.0</Version>
8787
</PackageReference>
8888
<PackageReference Include="System.Runtime">
8989
<Version>4.3.1</Version>

‎src/Compiler/src/Compiler/XSharpEvaluator/XSharpEvaluator.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>XSharp.Evaluator</AssemblyName>
1212
<RootNamespace>LanguageService.CodeAnalysis.ExpressionEvaluator</RootNamespace>
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14-
<NoWarn>1591,1573,1701,3021,RS0016</NoWarn>
14+
<NoWarn>1591,1573,1701,3021,RS0016</NoWarn>
1515
<!--<CodeAnalysisRuleSet>$(RoslynSrc)\Compilers\CSharp\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>-->
1616
<NoStdLib>true</NoStdLib>
1717
<GenerateMicrosoftCodeAnalysisCommitHashAttribute>false</GenerateMicrosoftCodeAnalysisCommitHashAttribute>
@@ -61,8 +61,8 @@
6161
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.7.0" />
6262
<PackageReference Include="Microsoft.VisualStudio.Debugger.Engine" Version="17.0.2012801" />
6363
<PackageReference Include="Microsoft.VisualStudio.Debugger.Metadata" Version="17.0.2012801" />
64-
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
65-
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
64+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
65+
<PackageReference Include="System.Reflection.Metadata" Version="7.0.1" />
6666
</ItemGroup>
6767
<ItemGroup>
6868
<ProjectReference Include="..\XSharpCodeAnalysis\XSharpCodeAnalysis.csproj" />

‎src/CompilerTests/Runtime/XSharp.Core.dll‎

0 Bytes
Binary file not shown.

‎src/CompilerTests/Runtime/XSharp.RT.dll‎

512 Bytes
Binary file not shown.

‎src/CompilerTests/xSharp Tests.xicfg‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,6 +2297,8 @@ APPLICATION = A46C8D0A-D5BA-4DF7-B629-76697F5DF2E6
22972297
LASTTOUCHED = 20250417114323
22982298
APPLICATION = DFFE8058-9B7C-475D-B047-8B8DC432D1C1
22992299
LASTTOUCHED = 20250610171332
2300+
APPLICATION = DDBE5F7D-7E84-4B9C-9C06-CB4664B740B2
2301+
LASTTOUCHED = 20250702083301
23002302

23012303
[File Settings]
23022304
FILE = 018196BD-ED9B-4D28-B739-2F6F63EF85DB
@@ -2360,10 +2362,5 @@ FILE = E9DF3356-7242-433B-9896-D95855934DB3
23602362
BREAKPOINT = 1,10
23612363

23622364
[OpenFiles]
2363-
OPENFILE=7B4DD920-5928-4A7C-B3B6-F0E0C9FF09F3,13,1
2364-
OPENFILE=65C401DA-ED2B-4656-86D0-C75D549DFF53,1,1
2365-
OPENFILE=19AE93BC-64F6-49A7-BCFE-7DF2CED35D8E,1,1
2366-
OPENFILE=58A5DEE4-316E-4841-BD23-ADF381ED07E9,20,1
2367-
OPENFILE=2E4D8C48-AB1E-44F8-83BD-309F9C6D2ECA,10,1
2368-
OPENFILE=54FFC7BE-F281-4B3F-9D74-AF73670B60FB,12,1
2369-
ACTIVEFILE=0A8C9546-D392-4E21-8F5D-451D00BBA06C,66,1
2365+
OPENFILE=F7F45F5E-DFD6-4920-BFCB-231BF8947475,14,1
2366+
OPENFILE=6D6FBCF4-C6F0-4A24-9A57-585399C6E46A,1,1

0 commit comments

Comments
 (0)