Skip to content

Commit 7a01e01

Browse files
RobertvanderHulstRobertvanderHulst
committed
Fix debugging problem in VS 2017 and VS 2019 by adjusting the versions of System.Collections.Immutable & System.Reflection.Metadata
1 parent 645786b commit 7a01e01

File tree

17 files changed

+66
-66
lines changed

17 files changed

+66
-66
lines changed

‎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/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

‎src/VisualStudio/Debugger/Debugger.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,18 @@
9292
<Version>15.0.533</Version>
9393
</PackageReference>
9494
<PackageReference Include="Microsoft.DiaSymReader">
95-
<Version>1.4.0</Version>
95+
<Version>2.0.0</Version>
9696
</PackageReference>
9797
<PackageReference Include="Microsoft.VisualStudio.Debugger.Metadata">
9898
<Version>15.9.28307</Version>
9999
</PackageReference>
100100
<PackageReference Include="Microsoft.VSSDK.Debugger.VSDConfigTool">
101-
<Version>16.0.2032702</Version>
101+
<Version>16.10.1051404</Version>
102102
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
103103
<PrivateAssets>all</PrivateAssets>
104104
</PackageReference>
105105
<PackageReference Include="System.Reflection.Metadata">
106-
<Version>8.0.1</Version>
106+
<Version>7.0.1</Version>
107107
</PackageReference>
108108
<PackageReference Include="System.Runtime">
109109
<Version>4.3.1</Version>

‎src/VisualStudio/Debugger/Debugger2022.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
To allow the project to be loaded in multiple VS versions, conditionally check the project -->
77
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
88
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
9-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
9+
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
1010
</PropertyGroup>
1111
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1212
<PropertyGroup>
@@ -105,8 +105,11 @@
105105
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
106106
<PrivateAssets>all</PrivateAssets>
107107
</PackageReference>
108+
<PackageReference Include="System.Collections.Immutable">
109+
<Version>8.0.0</Version>
110+
</PackageReference>
108111
<PackageReference Include="System.Reflection.Metadata">
109-
<Version>8.0.1</Version>
112+
<Version>7.0.1</Version>
110113
</PackageReference>
111114
<PackageReference Include="System.Runtime">
112115
<Version>4.3.1</Version>

‎src/VisualStudio/LanguageService/LanguageService.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
2020
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
2121
<Ngen>false</Ngen>
22-
<PlatformTarget>AnyCPU</PlatformTarget>
22+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
23+
<PlatformTarget>x86</PlatformTarget>
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2526
<DebugSymbols>true</DebugSymbols>

‎src/VisualStudio/ProjectBase/ProjectBase2022.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@
211211
<PackageReference Include="Microsoft.VisualStudio.Debugger.Engine">
212212
<Version>17.14.1051801</Version>
213213
</PackageReference>
214-
<PackageReference Include="System.Reflection.Metadata">
215-
<Version>8.0.1</Version>
216-
</PackageReference>
217214
<PackageReference Include="System.Runtime">
218215
<Version>4.3.1</Version>
219216
</PackageReference>

0 commit comments

Comments
 (0)