Skip to content

Commit 28f488a

Browse files
authored
Move the ConvertToString invariant culture changes under 17.12 changewave (#9968)
1 parent c09528f commit 28f488a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

documentation/wiki/ChangeWaves.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ A wave of features is set to "rotate out" (i.e. become standard functionality) t
2525

2626
### 17.12
2727
- [Log TaskParameterEvent for scalar parameters](https://github.com/dotnet/msbuild/pull/9908)
28+
- [Convert.ToString during a property evaluation uses the InvariantCulture for all types](https://github.com/dotnet/msbuild/pull/9874)
2829

2930
### 17.10
3031
- [AppDomain configuration is serialized without using BinFmt](https://github.com/dotnet/msbuild/pull/9320) - feature can be opted out only if [BinaryFormatter](https://learn.microsoft.com/en-us/dotnet/api/system.runtime.serialization.formatters.binary.binaryformatter) is allowed at runtime by editing `MSBuild.runtimeconfig.json`
@@ -38,7 +39,6 @@ A wave of features is set to "rotate out" (i.e. become standard functionality) t
3839
- [Exec task does not trim leading whitespaces for ConsoleOutput](https://github.com/dotnet/msbuild/pull/9722)
3940
- [Introduce [MSBuild]::StableStringHash overloads](https://github.com/dotnet/msbuild/issues/9519)
4041
- [Keep the encoding of standard output & error consistent with the console code page for ToolTask](https://github.com/dotnet/msbuild/pull/9539)
41-
- [Convert.ToString during a property evaluation uses the InvariantCulture for all types](https://github.com/dotnet/msbuild/pull/9874)
4242

4343
### 17.8
4444
- [[RAR] Don't do I/O on SDK-provided references](https://github.com/dotnet/msbuild/pull/8688)

src/Build.UnitTests/Evaluation/Expander_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4950,7 +4950,7 @@ public void ExpandItem_ConvertToStringUsingInvariantCultureForNumberData_Respect
49504950
var svSECultureInfo = new CultureInfo("sv-SE");
49514951
using (var env = TestEnvironment.Create())
49524952
{
4953-
env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_10.ToString());
4953+
env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_12.ToString());
49544954
currentThread.CurrentCulture = svSECultureInfo;
49554955
currentThread.CurrentUICulture = svSECultureInfo;
49564956
var root = env.CreateFolder();

src/Build/Evaluation/Expander.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ internal static string ConvertToString(object valueToConvert)
14791479
{
14801480
// The fall back is always to just convert to a string directly.
14811481
// Issue: https://github.com/dotnet/msbuild/issues/9757
1482-
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10))
1482+
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_12))
14831483
{
14841484
convertedString = Convert.ToString(valueToConvert, CultureInfo.InvariantCulture);
14851485
}

0 commit comments

Comments
 (0)