From d132f775f1ee063ae7c084f5042d158fa99491e2 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Thu, 8 Sep 2022 21:41:48 -0400 Subject: [PATCH 01/14] Initial commit --- .../src/System/Globalization/Calendar.cs | 14 +++++++------- .../src/System/Globalization/CalendarData.cs | 4 ++-- .../Globalization/EastAsianLunisolarCalendar.cs | 2 +- .../src/System/Globalization/GregorianCalendar.cs | 2 +- .../src/System/Globalization/JulianCalendar.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs index a24facc1ea19ac..901311d218cd1b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs @@ -650,10 +650,10 @@ internal virtual bool IsValidDay(int year, int month, int day, int era) /// Returns and assigns the maximum value to represent a two digit year. /// This value is the upper boundary of a 100 year range that allows a /// two digit year to be properly translated to a four digit year. - /// For example, if 2029 is the upper boundary, then a two digit value of - /// 30 should be interpreted as 1930 while a two digit value of 29 should - /// be interpreted as 2029. In this example, the 100 year range would be - /// from 1930-2029. See ToFourDigitYear(). + /// For example, if 2049 is the upper boundary, then a two digit value of + /// 30 should be interpreted as 1950 while a two digit value of 49 should + /// be interpreted as 2049. In this example, the 100 year range would be + /// from 1950-2049. See ToFourDigitYear(). /// public virtual int TwoDigitYearMax { @@ -667,9 +667,9 @@ public virtual int TwoDigitYearMax /// /// Converts the year value to the appropriate century by using the - /// TwoDigitYearMax property. For example, if the TwoDigitYearMax value is 2029, - /// then a two digit value of 30 will get converted to 1930 while a two digit - /// value of 29 will get converted to 2029. + /// TwoDigitYearMax property. For example, if the TwoDigitYearMax value is 2049, + /// then a two digit value of 50 will get converted to 1950 while a two digit + /// value of 49 will get converted to 2049. /// public virtual int ToFourDigitYear(int year) { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index 35e493adcbc9fd..b60fd8eb4c8044 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -40,7 +40,7 @@ internal sealed partial class CalendarData internal string[] saLeapYearMonthNames = null!; // Multiple strings for the month names in a leap year. // Integers at end to make marshaller happier - internal int iTwoDigitYearMax = 2029; // Max 2 digit year (for Y2K bug data entry) + internal int iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) private int iCurrentEra; // current era # (usually 1) // Use overrides? @@ -66,7 +66,7 @@ private static CalendarData CreateInvariant() invariant.sNativeName = "Gregorian Calendar"; // Calendar Name // Year - invariant.iTwoDigitYearMax = 2029; // Max 2 digit year (for Y2K bug data entry) + invariant.iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) invariant.iCurrentEra = 1; // Current era # // Formats diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs index 73322a6570a726..6e5a322c6d1cb0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs @@ -646,7 +646,7 @@ public override bool IsLeapYear(int year, int era) return InternalIsLeapYear(year); } - private const int DefaultGregorianTwoDigitYearMax = 2029; + private const int DefaultGregorianTwoDigitYearMax = 2049; public override int TwoDigitYearMax { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/GregorianCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/GregorianCalendar.cs index e883c8e3772adf..bc49fb7b37f73b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/GregorianCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/GregorianCalendar.cs @@ -406,7 +406,7 @@ internal override bool TryToDateTime(int year, int month, int day, int hour, int return DateTime.TryCreate(year, month, day, hour, minute, second, millisecond, out result); } - private const int DefaultTwoDigitYearMax = 2029; + private const int DefaultTwoDigitYearMax = 2049; public override int TwoDigitYearMax { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/JulianCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/JulianCalendar.cs index c7f13158a326c7..d81f1ca00382a1 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/JulianCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/JulianCalendar.cs @@ -54,7 +54,7 @@ public class JulianCalendar : Calendar public JulianCalendar() { // There is no system setting of TwoDigitYear max, so set the value here. - _twoDigitYearMax = 2029; + _twoDigitYearMax = 2049; } internal override CalendarId ID => CalendarId.JULIAN; From 4873c8bff4046f748fcaa3bb340145536770cd9c Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Mon, 10 Oct 2022 22:44:19 -0400 Subject: [PATCH 02/14] Updating unit tests --- .../System.Globalization.Calendars.sln | 95 +++++++++------- .../GregorianCalendarTwoDigitYearMax.cs | 2 +- .../KoreanCalendarTwoDigitYearMax.cs | 2 +- .../ThaiBuddhistCalendarToFourDigitYear.cs | 2 +- .../ThaiBuddhistCalendarTwoDigitYearMax.cs | 2 +- .../System.Globalization.sln | 107 ++++++++++-------- .../src/System/Globalization/CalendarData.cs | 2 +- .../EastAsianLunisolarCalendar.cs | 2 +- 8 files changed, 114 insertions(+), 100 deletions(-) diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln index dcce7bd5b442de..c04f2873792af3 100644 --- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln +++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln @@ -1,4 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32922.545 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{32F01C47-D495-45CE-9567-E4C434F7D627}" @@ -31,17 +35,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{749527EE-F2D EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.ActiveCfg = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.Build.0 = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.ActiveCfg = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.Build.0 = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.ActiveCfg = Checked|x86 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.Build.0 = Checked|x86 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.ActiveCfg = Debug|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.Build.0 = Debug|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x64.ActiveCfg = Debug|x64 @@ -54,12 +64,9 @@ Global {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x64.Build.0 = Release|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.ActiveCfg = Release|x86 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.Build.0 = Release|x86 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.ActiveCfg = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.Build.0 = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.ActiveCfg = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.Build.0 = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.ActiveCfg = Checked|x86 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.Build.0 = Checked|x86 + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x64.ActiveCfg = Debug|Any CPU + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x86.ActiveCfg = Debug|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.Build.0 = Debug|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -72,9 +79,9 @@ Global {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x64.Build.0 = Release|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.ActiveCfg = Release|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.Build.0 = Release|Any CPU - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x64.ActiveCfg = Debug|Any CPU - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x86.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x64.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x86.ActiveCfg = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -87,9 +94,9 @@ Global {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x64.Build.0 = Release|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.ActiveCfg = Release|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.Build.0 = Release|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x64.ActiveCfg = Debug|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x86.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x64.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x86.ActiveCfg = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.Build.0 = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -102,9 +109,9 @@ Global {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x64.Build.0 = Release|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.ActiveCfg = Release|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.Build.0 = Release|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x64.ActiveCfg = Debug|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x86.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x64.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x86.ActiveCfg = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -117,9 +124,9 @@ Global {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x64.Build.0 = Release|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.ActiveCfg = Release|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.Build.0 = Release|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x64.ActiveCfg = Debug|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x86.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x64.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x86.ActiveCfg = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -132,9 +139,9 @@ Global {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x64.Build.0 = Release|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.ActiveCfg = Release|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.Build.0 = Release|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x64.ActiveCfg = Debug|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x86.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x64.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.ActiveCfg = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|Any CPU.Build.0 = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -147,9 +154,9 @@ Global {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x64.Build.0 = Release|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x86.ActiveCfg = Release|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x86.Build.0 = Release|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x64.ActiveCfg = Debug|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x64.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x86.ActiveCfg = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|Any CPU.Build.0 = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -162,9 +169,9 @@ Global {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x64.Build.0 = Release|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x86.ActiveCfg = Release|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x86.Build.0 = Release|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x64.ActiveCfg = Debug|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x86.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.ActiveCfg = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.Build.0 = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -177,9 +184,9 @@ Global {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x64.Build.0 = Release|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.ActiveCfg = Release|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.Build.0 = Release|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.ActiveCfg = Debug|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x64.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x86.ActiveCfg = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -192,9 +199,9 @@ Global {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x64.Build.0 = Release|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x86.ActiveCfg = Release|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x86.Build.0 = Release|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x64.ActiveCfg = Debug|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x86.ActiveCfg = Debug|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x64.ActiveCfg = Debug|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x86.ActiveCfg = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -207,27 +214,27 @@ Global {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x64.Build.0 = Release|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x86.ActiveCfg = Release|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x86.Build.0 = Release|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x64.ActiveCfg = Debug|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {E70B35E3-B6C3-4196-9FAB-1A0D45748E79} = {37875A74-8496-4B3B-828D-C397F5379B65} - {705D0D71-8890-4893-824F-E302CDE5349F} = {37875A74-8496-4B3B-828D-C397F5379B65} {32F01C47-D495-45CE-9567-E4C434F7D627} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} + {6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10} + {705D0D71-8890-4893-824F-E302CDE5349F} = {37875A74-8496-4B3B-828D-C397F5379B65} {CD1CDCDD-64FA-4E75-A74F-16A978C56449} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} - {6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10} - {D99C08B2-8AEF-4767-BAFC-10DC63478640} = {4449A37B-FFED-470F-9F39-24611CB72D10} - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF} = {4449A37B-FFED-470F-9F39-24611CB72D10} {617B4727-AA14-4840-8898-1947D7C6E437} = {749527EE-F2D9-4169-A75A-B00BA30651A1} + {D99C08B2-8AEF-4767-BAFC-10DC63478640} = {4449A37B-FFED-470F-9F39-24611CB72D10} {85FFAE67-940A-4C58-AF73-0E0CF9722B29} = {749527EE-F2D9-4169-A75A-B00BA30651A1} {6AADBEF6-644B-4174-9AB4-EB6023E2404B} = {749527EE-F2D9-4169-A75A-B00BA30651A1} + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF} = {4449A37B-FFED-470F-9F39-24611CB72D10} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A91A21-729E-4C60-BCD4-389B47ED823F} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{e70b35e3-b6c3-4196-9fab-1a0d45748e79}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs index 3f6517d4127ae8..e35e9594ea4e01 100644 --- a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs @@ -22,7 +22,7 @@ public class GregorianCalendarTwoDigitYearMax public void TwoDigitYearMax(GregorianCalendarTypes calendarType) { Calendar calendar = new GregorianCalendar(calendarType); - Assert.True(calendar.TwoDigitYearMax == 2029 || calendar.TwoDigitYearMax == 2049, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 2049 || calendar.TwoDigitYearMax == 2069, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); int randomTwoDigitYearMax = MinTwoDigitYear + s_randomDataGenerator.GetInt32(-55) % (MaxYear - MinTwoDigitYear + 1); calendar.TwoDigitYearMax = randomTwoDigitYearMax; diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs index 64b236ec5775ff..d59cb56a88fbb8 100644 --- a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs @@ -11,7 +11,7 @@ public class KoreanCalendarTwoDigitYearMax public void TwoDigitYearMax_Get() { var calendar = new KoreanCalendar(); - Assert.True(calendar.TwoDigitYearMax == 4362 || calendar.TwoDigitYearMax == 4382, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 4382 || calendar.TwoDigitYearMax == 4402, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); } [Theory] diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs index a80fd1e40dc6c1..2728049fee790f 100644 --- a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs +++ b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs @@ -16,7 +16,7 @@ public class ThaiBuddhistCalendarToFourDigitYear public void ToFourDigitYear(int year) { ThaiBuddhistCalendar calendar = new ThaiBuddhistCalendar(); - calendar.TwoDigitYearMax = 2029; + calendar.TwoDigitYearMax = 2049; if (year > 99) { Assert.Equal(year, calendar.ToFourDigitYear(year)); diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs index 53e551058ee2d5..ad021dd1771dfd 100644 --- a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs @@ -12,7 +12,7 @@ public class ThaiBuddhistCalendarTwoDigitYearMax public void TwoDigitYearMax_Get() { var calendar = new ThaiBuddhistCalendar(); - Assert.True(calendar.TwoDigitYearMax == 2029 + 543 || calendar.TwoDigitYearMax == 2049 + 543, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 2049 + 543 || calendar.TwoDigitYearMax == 2069 + 543, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); } public static IEnumerable TwoDigitYearMax_Set_TestData() diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index 3f8004a3276622..eed3fa6abc49b0 100644 --- a/src/libraries/System.Globalization/System.Globalization.sln +++ b/src/libraries/System.Globalization/System.Globalization.sln @@ -1,4 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32922.545 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{79613DED-481D-44EF-BB89-7AC6BD53026B}" @@ -35,17 +39,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0378EF1C-983 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.ActiveCfg = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.Build.0 = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.ActiveCfg = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.Build.0 = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.ActiveCfg = Checked|x86 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.Build.0 = Checked|x86 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.ActiveCfg = Debug|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.Build.0 = Debug|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x64.ActiveCfg = Debug|x64 @@ -58,12 +68,9 @@ Global {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x64.Build.0 = Release|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.ActiveCfg = Release|x86 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.Build.0 = Release|x86 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.ActiveCfg = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.Build.0 = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.ActiveCfg = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.Build.0 = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.ActiveCfg = Checked|x86 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.Build.0 = Checked|x86 + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x64.ActiveCfg = Debug|Any CPU + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x86.ActiveCfg = Debug|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.Build.0 = Debug|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -76,9 +83,9 @@ Global {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x64.Build.0 = Release|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.ActiveCfg = Release|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.Build.0 = Release|Any CPU - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x64.ActiveCfg = Debug|Any CPU - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x86.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x64.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x86.ActiveCfg = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.Build.0 = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -91,9 +98,9 @@ Global {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x64.Build.0 = Release|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.ActiveCfg = Release|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.Build.0 = Release|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x64.ActiveCfg = Debug|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x86.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x64.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x86.ActiveCfg = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.Build.0 = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -106,9 +113,9 @@ Global {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x64.Build.0 = Release|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.ActiveCfg = Release|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.Build.0 = Release|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x64.ActiveCfg = Debug|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x86.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x64.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x86.ActiveCfg = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -121,9 +128,9 @@ Global {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x64.Build.0 = Release|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.ActiveCfg = Release|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.Build.0 = Release|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x64.ActiveCfg = Debug|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x86.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x64.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x86.ActiveCfg = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -136,9 +143,9 @@ Global {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x64.Build.0 = Release|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.ActiveCfg = Release|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.Build.0 = Release|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x64.ActiveCfg = Debug|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x86.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x64.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x86.ActiveCfg = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -151,9 +158,9 @@ Global {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x64.Build.0 = Release|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.ActiveCfg = Release|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.Build.0 = Release|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x64.ActiveCfg = Debug|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x86.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x64.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x86.ActiveCfg = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.Build.0 = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -166,9 +173,9 @@ Global {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x64.Build.0 = Release|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.ActiveCfg = Release|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.Build.0 = Release|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x64.ActiveCfg = Debug|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x86.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x64.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.ActiveCfg = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|Any CPU.Build.0 = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -181,9 +188,9 @@ Global {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x64.Build.0 = Release|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x86.ActiveCfg = Release|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x86.Build.0 = Release|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x64.ActiveCfg = Debug|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x64.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x86.ActiveCfg = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -196,9 +203,9 @@ Global {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x64.Build.0 = Release|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x86.ActiveCfg = Release|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x86.Build.0 = Release|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x64.ActiveCfg = Debug|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x86.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.ActiveCfg = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -211,9 +218,9 @@ Global {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x64.Build.0 = Release|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.ActiveCfg = Release|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.Build.0 = Release|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.ActiveCfg = Debug|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x64.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x86.ActiveCfg = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -226,9 +233,9 @@ Global {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x64.Build.0 = Release|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x86.ActiveCfg = Release|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x86.Build.0 = Release|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x64.ActiveCfg = Debug|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x86.ActiveCfg = Debug|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x64.ActiveCfg = Debug|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x86.ActiveCfg = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -241,29 +248,29 @@ Global {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x64.Build.0 = Release|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x86.ActiveCfg = Release|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x86.Build.0 = Release|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x64.ActiveCfg = Debug|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB} = {4B81A206-3C49-4224-A031-42583071751B} - {4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {4B81A206-3C49-4224-A031-42583071751B} {79613DED-481D-44EF-BB89-7AC6BD53026B} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {40231BCB-E151-45E0-A1C4-4D559A434362} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} + {55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} + {4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {4B81A206-3C49-4224-A031-42583071751B} {DD7E56B4-65B7-4822-A4E1-ECDD51524927} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {9B797657-6BBC-4240-9903-3FCE3E1FC713} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} - {55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} {74CAB3C9-1AE1-467E-B139-35E7113F4660} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} {12E788BB-7E58-4780-B52E-DB5A91A49DFF} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} {F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33E0B3D0-C6E1-4B75-A025-AE012AD424F7} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{e269f8bb-f629-4c96-b9b2-03a00d8b1bfb}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index b60fd8eb4c8044..a6adca6cbcad99 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -40,7 +40,7 @@ internal sealed partial class CalendarData internal string[] saLeapYearMonthNames = null!; // Multiple strings for the month names in a leap year. // Integers at end to make marshaller happier - internal int iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) + internal int iTwoDigitYearMax = 2049; // Max 2 digit year private int iCurrentEra; // current era # (usually 1) // Use overrides? diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs index 6e5a322c6d1cb0..42c44e50fe21fb 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs @@ -654,7 +654,7 @@ public override int TwoDigitYearMax { if (_twoDigitYearMax == -1) { - _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, GetYear(new DateTime(DefaultGregorianTwoDigitYearMax, 1, 1))); + _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, DefaultGregorianTwoDigitYearMax); } return _twoDigitYearMax; From a43ef8b634a34e7b88c73542744d89d3902dd0f4 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:36:51 -0400 Subject: [PATCH 03/14] Removing .sln changes --- .../tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs | 2 +- .../tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs | 2 +- .../ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs | 2 +- .../ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs | 2 +- .../src/System/Globalization/CalendarData.cs | 2 +- .../src/System/Globalization/EastAsianLunisolarCalendar.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs index e35e9594ea4e01..3f6517d4127ae8 100644 --- a/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs @@ -22,7 +22,7 @@ public class GregorianCalendarTwoDigitYearMax public void TwoDigitYearMax(GregorianCalendarTypes calendarType) { Calendar calendar = new GregorianCalendar(calendarType); - Assert.True(calendar.TwoDigitYearMax == 2049 || calendar.TwoDigitYearMax == 2069, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 2029 || calendar.TwoDigitYearMax == 2049, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); int randomTwoDigitYearMax = MinTwoDigitYear + s_randomDataGenerator.GetInt32(-55) % (MaxYear - MinTwoDigitYear + 1); calendar.TwoDigitYearMax = randomTwoDigitYearMax; diff --git a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs index d59cb56a88fbb8..64b236ec5775ff 100644 --- a/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs @@ -11,7 +11,7 @@ public class KoreanCalendarTwoDigitYearMax public void TwoDigitYearMax_Get() { var calendar = new KoreanCalendar(); - Assert.True(calendar.TwoDigitYearMax == 4382 || calendar.TwoDigitYearMax == 4402, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 4362 || calendar.TwoDigitYearMax == 4382, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); } [Theory] diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs index 2728049fee790f..a80fd1e40dc6c1 100644 --- a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs +++ b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs @@ -16,7 +16,7 @@ public class ThaiBuddhistCalendarToFourDigitYear public void ToFourDigitYear(int year) { ThaiBuddhistCalendar calendar = new ThaiBuddhistCalendar(); - calendar.TwoDigitYearMax = 2049; + calendar.TwoDigitYearMax = 2029; if (year > 99) { Assert.Equal(year, calendar.ToFourDigitYear(year)); diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs index ad021dd1771dfd..53e551058ee2d5 100644 --- a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs +++ b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs @@ -12,7 +12,7 @@ public class ThaiBuddhistCalendarTwoDigitYearMax public void TwoDigitYearMax_Get() { var calendar = new ThaiBuddhistCalendar(); - Assert.True(calendar.TwoDigitYearMax == 2049 + 543 || calendar.TwoDigitYearMax == 2069 + 543, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); + Assert.True(calendar.TwoDigitYearMax == 2029 + 543 || calendar.TwoDigitYearMax == 2049 + 543, $"Unexpected calendar.TwoDigitYearMax {calendar.TwoDigitYearMax}"); } public static IEnumerable TwoDigitYearMax_Set_TestData() diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index a6adca6cbcad99..b60fd8eb4c8044 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -40,7 +40,7 @@ internal sealed partial class CalendarData internal string[] saLeapYearMonthNames = null!; // Multiple strings for the month names in a leap year. // Integers at end to make marshaller happier - internal int iTwoDigitYearMax = 2049; // Max 2 digit year + internal int iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) private int iCurrentEra; // current era # (usually 1) // Use overrides? diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs index 42c44e50fe21fb..6e5a322c6d1cb0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs @@ -654,7 +654,7 @@ public override int TwoDigitYearMax { if (_twoDigitYearMax == -1) { - _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, DefaultGregorianTwoDigitYearMax); + _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, GetYear(new DateTime(DefaultGregorianTwoDigitYearMax, 1, 1))); } return _twoDigitYearMax; From e5a0630d92baf8cda593391e76179efb5643c4db Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:43:13 -0400 Subject: [PATCH 04/14] Update ThaiBuddhistCalendarToFourDigitYear.cs --- .../ThaiBuddhistCalendarToFourDigitYear.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs index a80fd1e40dc6c1..efec0263fc5315 100644 --- a/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs +++ b/src/libraries/System.Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs @@ -16,12 +16,12 @@ public class ThaiBuddhistCalendarToFourDigitYear public void ToFourDigitYear(int year) { ThaiBuddhistCalendar calendar = new ThaiBuddhistCalendar(); - calendar.TwoDigitYearMax = 2029; + calendar.TwoDigitYearMax = 2049; if (year > 99) { Assert.Equal(year, calendar.ToFourDigitYear(year)); } - else if (year > 29) + else if (year > 49) { Assert.Equal(year + 1900, calendar.ToFourDigitYear(year)); } From 46950ac0c3400290ca568953492d2388ccd4e0b2 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:45:09 -0400 Subject: [PATCH 05/14] Update System.Globalization.sln --- .../System.Globalization.sln | 107 ++++++++---------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index eed3fa6abc49b0..3f8004a3276622 100644 --- a/src/libraries/System.Globalization/System.Globalization.sln +++ b/src/libraries/System.Globalization/System.Globalization.sln @@ -1,8 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32922.545 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{79613DED-481D-44EF-BB89-7AC6BD53026B}" @@ -39,23 +35,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0378EF1C-983 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.ActiveCfg = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.Build.0 = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.ActiveCfg = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.Build.0 = Checked|x64 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.ActiveCfg = Checked|x86 - {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.Build.0 = Checked|x86 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.ActiveCfg = Debug|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.Build.0 = Debug|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x64.ActiveCfg = Debug|x64 @@ -68,9 +58,12 @@ Global {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x64.Build.0 = Release|x64 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.ActiveCfg = Release|x86 {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.Build.0 = Release|x86 - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x64.ActiveCfg = Debug|Any CPU - {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x86.ActiveCfg = Debug|Any CPU + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.ActiveCfg = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.Build.0 = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.ActiveCfg = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.Build.0 = Checked|x64 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.ActiveCfg = Checked|x86 + {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.Build.0 = Checked|x86 {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.Build.0 = Debug|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -83,9 +76,9 @@ Global {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x64.Build.0 = Release|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.ActiveCfg = Release|Any CPU {79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.Build.0 = Release|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x64.ActiveCfg = Debug|Any CPU - {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x86.ActiveCfg = Debug|Any CPU + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x64.ActiveCfg = Debug|Any CPU + {79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x86.ActiveCfg = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.Build.0 = Debug|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -98,9 +91,9 @@ Global {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x64.Build.0 = Release|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.ActiveCfg = Release|Any CPU {40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.Build.0 = Release|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x64.ActiveCfg = Debug|Any CPU - {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x86.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x64.ActiveCfg = Debug|Any CPU + {40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x86.ActiveCfg = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.Build.0 = Debug|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -113,9 +106,9 @@ Global {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x64.Build.0 = Release|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.ActiveCfg = Release|Any CPU {55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.Build.0 = Release|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x64.ActiveCfg = Debug|Any CPU - {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x86.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x64.ActiveCfg = Debug|Any CPU + {55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x86.ActiveCfg = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -128,9 +121,9 @@ Global {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x64.Build.0 = Release|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.ActiveCfg = Release|Any CPU {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.Build.0 = Release|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x64.ActiveCfg = Debug|Any CPU - {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x86.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x64.ActiveCfg = Debug|Any CPU + {4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x86.ActiveCfg = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -143,9 +136,9 @@ Global {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x64.Build.0 = Release|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.ActiveCfg = Release|Any CPU {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.Build.0 = Release|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x64.ActiveCfg = Debug|Any CPU - {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x86.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x64.ActiveCfg = Debug|Any CPU + {DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x86.ActiveCfg = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -158,9 +151,9 @@ Global {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x64.Build.0 = Release|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.ActiveCfg = Release|Any CPU {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.Build.0 = Release|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x64.ActiveCfg = Debug|Any CPU - {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x86.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x64.ActiveCfg = Debug|Any CPU + {9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x86.ActiveCfg = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.Build.0 = Debug|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -173,9 +166,9 @@ Global {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x64.Build.0 = Release|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.ActiveCfg = Release|Any CPU {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.Build.0 = Release|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x64.ActiveCfg = Debug|Any CPU - {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x64.ActiveCfg = Debug|Any CPU + {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x86.ActiveCfg = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|Any CPU.Build.0 = Debug|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -188,9 +181,9 @@ Global {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x64.Build.0 = Release|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x86.ActiveCfg = Release|Any CPU {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Release|x86.Build.0 = Release|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x64.ActiveCfg = Debug|Any CPU - {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x86.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x64.ActiveCfg = Debug|Any CPU + {74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.ActiveCfg = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -203,9 +196,9 @@ Global {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x64.Build.0 = Release|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x86.ActiveCfg = Release|Any CPU {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Release|x86.Build.0 = Release|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.ActiveCfg = Debug|Any CPU - {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x64.ActiveCfg = Debug|Any CPU + {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1}.Checked|x86.ActiveCfg = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -218,9 +211,9 @@ Global {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x64.Build.0 = Release|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.ActiveCfg = Release|Any CPU {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.Build.0 = Release|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x64.ActiveCfg = Debug|Any CPU - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x86.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.ActiveCfg = Debug|Any CPU + {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.ActiveCfg = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -233,9 +226,9 @@ Global {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x64.Build.0 = Release|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x86.ActiveCfg = Release|Any CPU {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Release|x86.Build.0 = Release|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x64.ActiveCfg = Debug|Any CPU - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x86.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x64.ActiveCfg = Debug|Any CPU + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Checked|x86.ActiveCfg = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -248,29 +241,29 @@ Global {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x64.Build.0 = Release|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x86.ActiveCfg = Release|Any CPU {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Release|x86.Build.0 = Release|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x64.ActiveCfg = Debug|Any CPU + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB} = {4B81A206-3C49-4224-A031-42583071751B} + {4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {4B81A206-3C49-4224-A031-42583071751B} {79613DED-481D-44EF-BB89-7AC6BD53026B} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {40231BCB-E151-45E0-A1C4-4D559A434362} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} - {55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} - {4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {4B81A206-3C49-4224-A031-42583071751B} {DD7E56B4-65B7-4822-A4E1-ECDD51524927} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {9B797657-6BBC-4240-9903-3FCE3E1FC713} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} - {74CAB3C9-1AE1-467E-B139-35E7113F4660} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} + {55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} {4AEE93BE-2DDE-4429-BEE1-13E419B80BA1} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} + {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} + {74CAB3C9-1AE1-467E-B139-35E7113F4660} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} {12E788BB-7E58-4780-B52E-DB5A91A49DFF} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} {F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} - {41F80FEC-8515-455F-AC3E-D88B6CAAF8DA} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33E0B3D0-C6E1-4B75-A025-AE012AD424F7} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{e269f8bb-f629-4c96-b9b2-03a00d8b1bfb}*SharedItemsImports = 5 - EndGlobalSection EndGlobal From 635d695ce64d12b0b4925e2e0e08ce178ab6c363 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:48:02 -0400 Subject: [PATCH 06/14] Update System.Globalization.Calendars.sln --- .../System.Globalization.Calendars.sln | 95 +++++++++---------- 1 file changed, 44 insertions(+), 51 deletions(-) diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln index c04f2873792af3..dcce7bd5b442de 100644 --- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln +++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln @@ -1,8 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32922.545 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{32F01C47-D495-45CE-9567-E4C434F7D627}" @@ -35,23 +31,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{749527EE-F2D EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.ActiveCfg = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.Build.0 = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.ActiveCfg = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.Build.0 = Checked|x64 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.ActiveCfg = Checked|x86 - {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.Build.0 = Checked|x86 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.ActiveCfg = Debug|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.Build.0 = Debug|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x64.ActiveCfg = Debug|x64 @@ -64,9 +54,12 @@ Global {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x64.Build.0 = Release|x64 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.ActiveCfg = Release|x86 {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.Build.0 = Release|x86 - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x64.ActiveCfg = Debug|Any CPU - {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x86.ActiveCfg = Debug|Any CPU + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.ActiveCfg = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.Build.0 = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.ActiveCfg = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.Build.0 = Checked|x64 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.ActiveCfg = Checked|x86 + {E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.Build.0 = Checked|x86 {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.Build.0 = Debug|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -79,9 +72,9 @@ Global {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x64.Build.0 = Release|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.ActiveCfg = Release|Any CPU {32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.Build.0 = Release|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x64.ActiveCfg = Debug|Any CPU - {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x86.ActiveCfg = Debug|Any CPU + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x64.ActiveCfg = Debug|Any CPU + {32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x86.ActiveCfg = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -94,9 +87,9 @@ Global {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x64.Build.0 = Release|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.ActiveCfg = Release|Any CPU {6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.Build.0 = Release|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x64.ActiveCfg = Debug|Any CPU - {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x86.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x64.ActiveCfg = Debug|Any CPU + {6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x86.ActiveCfg = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.Build.0 = Debug|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -109,9 +102,9 @@ Global {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x64.Build.0 = Release|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.ActiveCfg = Release|Any CPU {705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.Build.0 = Release|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x64.ActiveCfg = Debug|Any CPU - {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x86.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x64.ActiveCfg = Debug|Any CPU + {705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x86.ActiveCfg = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -124,9 +117,9 @@ Global {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x64.Build.0 = Release|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.ActiveCfg = Release|Any CPU {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.Build.0 = Release|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x64.ActiveCfg = Debug|Any CPU - {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x86.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x64.ActiveCfg = Debug|Any CPU + {CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x86.ActiveCfg = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -139,9 +132,9 @@ Global {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x64.Build.0 = Release|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.ActiveCfg = Release|Any CPU {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.Build.0 = Release|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x64.ActiveCfg = Debug|Any CPU - {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x64.ActiveCfg = Debug|Any CPU + {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x86.ActiveCfg = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|Any CPU.Build.0 = Debug|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -154,9 +147,9 @@ Global {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x64.Build.0 = Release|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x86.ActiveCfg = Release|Any CPU {617B4727-AA14-4840-8898-1947D7C6E437}.Release|x86.Build.0 = Release|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x64.ActiveCfg = Debug|Any CPU - {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x86.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x64.ActiveCfg = Debug|Any CPU + {617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.ActiveCfg = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|Any CPU.Build.0 = Debug|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -169,9 +162,9 @@ Global {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x64.Build.0 = Release|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x86.ActiveCfg = Release|Any CPU {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Release|x86.Build.0 = Release|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.ActiveCfg = Debug|Any CPU - {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x64.ActiveCfg = Debug|Any CPU + {D99C08B2-8AEF-4767-BAFC-10DC63478640}.Checked|x86.ActiveCfg = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.Build.0 = Debug|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -184,9 +177,9 @@ Global {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x64.Build.0 = Release|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.ActiveCfg = Release|Any CPU {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.Build.0 = Release|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x64.ActiveCfg = Debug|Any CPU - {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x86.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.ActiveCfg = Debug|Any CPU + {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.ActiveCfg = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -199,9 +192,9 @@ Global {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x64.Build.0 = Release|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x86.ActiveCfg = Release|Any CPU {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Release|x86.Build.0 = Release|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x64.ActiveCfg = Debug|Any CPU - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x86.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x64.ActiveCfg = Debug|Any CPU + {6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Checked|x86.ActiveCfg = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -214,27 +207,27 @@ Global {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x64.Build.0 = Release|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x86.ActiveCfg = Release|Any CPU {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Release|x86.Build.0 = Release|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x64.ActiveCfg = Debug|Any CPU + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {E70B35E3-B6C3-4196-9FAB-1A0D45748E79} = {37875A74-8496-4B3B-828D-C397F5379B65} - {32F01C47-D495-45CE-9567-E4C434F7D627} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} - {6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10} {705D0D71-8890-4893-824F-E302CDE5349F} = {37875A74-8496-4B3B-828D-C397F5379B65} + {32F01C47-D495-45CE-9567-E4C434F7D627} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {CD1CDCDD-64FA-4E75-A74F-16A978C56449} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} - {617B4727-AA14-4840-8898-1947D7C6E437} = {749527EE-F2D9-4169-A75A-B00BA30651A1} + {6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10} {D99C08B2-8AEF-4767-BAFC-10DC63478640} = {4449A37B-FFED-470F-9F39-24611CB72D10} + {80B76066-1C3A-449A-8E4B-76F7D2C74FEF} = {4449A37B-FFED-470F-9F39-24611CB72D10} + {617B4727-AA14-4840-8898-1947D7C6E437} = {749527EE-F2D9-4169-A75A-B00BA30651A1} {85FFAE67-940A-4C58-AF73-0E0CF9722B29} = {749527EE-F2D9-4169-A75A-B00BA30651A1} {6AADBEF6-644B-4174-9AB4-EB6023E2404B} = {749527EE-F2D9-4169-A75A-B00BA30651A1} - {80B76066-1C3A-449A-8E4B-76F7D2C74FEF} = {4449A37B-FFED-470F-9F39-24611CB72D10} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A91A21-729E-4C60-BCD4-389B47ED823F} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{e70b35e3-b6c3-4196-9fab-1a0d45748e79}*SharedItemsImports = 5 - EndGlobalSection EndGlobal From ab97ec0acc39969a2d2eb7131d57e6e09f85a33b Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Tue, 11 Oct 2022 19:01:16 -0400 Subject: [PATCH 07/14] Remove Y2K and Marshaller comments --- .../src/System/Globalization/CalendarData.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index b60fd8eb4c8044..83d8bf7ee3b43a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -39,8 +39,7 @@ internal sealed partial class CalendarData internal string[] saAbbrevMonthGenitiveNames = null!; // Genitive Abbrev Month Names (13) internal string[] saLeapYearMonthNames = null!; // Multiple strings for the month names in a leap year. - // Integers at end to make marshaller happier - internal int iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) + internal int iTwoDigitYearMax = 2049; // Max 2 digit year private int iCurrentEra; // current era # (usually 1) // Use overrides? From 527dca28c698bddefeb24e9a7df5a148731f226c Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Tue, 11 Oct 2022 19:09:07 -0400 Subject: [PATCH 08/14] Adding in OS check for determining whether to use ICU or NLS --- .../src/System/Globalization/Calendar.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs index 901311d218cd1b..20b09f670208dc 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; +using System.Runtime.InteropServices; namespace System.Globalization { @@ -711,7 +712,7 @@ internal static long TimeToTicks(int hour, int minute, int second, int milliseco internal static int GetSystemTwoDigitYearSetting(CalendarId CalID, int defaultYearValue) { - int twoDigitYearMax = GlobalizationMode.UseNls ? CalendarData.NlsGetTwoDigitYearMax(CalID) : CalendarData.IcuGetTwoDigitYearMax(); + int twoDigitYearMax = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? CalendarData.NlsGetTwoDigitYearMax(CalID) : CalendarData.IcuGetTwoDigitYearMax(); return twoDigitYearMax >= 0 ? twoDigitYearMax : defaultYearValue; } } From ee3b20bd0fcf679cdcb0cbf7cfacb81c26bbff86 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Tue, 11 Oct 2022 19:51:15 -0400 Subject: [PATCH 09/14] Refactoring code for determining which two digit year max to use (Windows/Unix) --- .../src/System/Globalization/Calendar.cs | 2 +- .../src/System/Globalization/CalendarData.Icu.cs | 9 --------- .../src/System/Globalization/CalendarData.Nls.cs | 11 ----------- .../src/System/Globalization/CalendarData.Unix.cs | 13 ++++++++++++- .../System/Globalization/CalendarData.Windows.cs | 11 +++++++++++ 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs index 20b09f670208dc..ed7a1844b3f82a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/Calendar.cs @@ -712,7 +712,7 @@ internal static long TimeToTicks(int hour, int minute, int second, int milliseco internal static int GetSystemTwoDigitYearSetting(CalendarId CalID, int defaultYearValue) { - int twoDigitYearMax = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? CalendarData.NlsGetTwoDigitYearMax(CalID) : CalendarData.IcuGetTwoDigitYearMax(); + int twoDigitYearMax = CalendarData.GetTwoDigitYearMax(CalID); return twoDigitYearMax >= 0 ? twoDigitYearMax : defaultYearValue; } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs index 77ceddee9662a1..7be936a58c5059 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs @@ -81,15 +81,6 @@ private bool IcuLoadCalendarDataFromSystem(string localeName, CalendarId calenda return result; } - internal static int IcuGetTwoDigitYearMax() - { - Debug.Assert(!GlobalizationMode.UseNls); - - // There is no user override for this value on Linux or in ICU. - // So just return -1 to use the hard-coded defaults. - return -1; - } - // Call native side to figure out which calendars are allowed internal static int IcuGetCalendars(string localeName, CalendarId[] calendars) { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs index 3c1cc9d4d291ec..ae90d25dce1271 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs @@ -10,17 +10,6 @@ namespace System.Globalization { internal sealed partial class CalendarData { - // Get native two digit year max - internal static int NlsGetTwoDigitYearMax(CalendarId calendarId) - { - Debug.Assert(GlobalizationMode.UseNls); - - return GlobalizationMode.Invariant ? Invariant.iTwoDigitYearMax : - CallGetCalendarInfoEx(null, calendarId, CAL_ITWODIGITYEARMAX, out int twoDigitYearMax) ? - twoDigitYearMax : - -1; - } - private static bool NlsSystemSupportsTaiwaneseCalendar() { Debug.Assert(!GlobalizationMode.Invariant); diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs index fede23f8e25761..3af7daa6c91e73 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; + namespace System.Globalization { internal sealed partial class CalendarData @@ -12,5 +14,14 @@ private bool LoadCalendarDataFromSystemCore(string localeName, CalendarId calend internal static int GetCalendarsCore(string localeName, bool useUserOverride, CalendarId[] calendars) => IcuGetCalendars(localeName, calendars); #pragma warning restore IDE0060 - } + + internal static int GetTwoDigitYearMax(CalendarId calendarId) + { + Debug.Assert(!GlobalizationMode.UseNls); + + // There is no user override for this value on Linux or in ICU. + // So just return -1 to use the hard-coded defaults. + return -1; + } + } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs index bf787bb66bf36a..4301b71ac43a08 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs @@ -426,5 +426,16 @@ private static int NlsGetCalendars(string localeName, bool useUserOverride, Cale // Now we have a list of data, return the count return data.calendars.Count; } + + // Get native two digit year max + internal static int GetTwoDigitYearMax(CalendarId calendarId) + { + Debug.Assert(GlobalizationMode.UseNls); + + return GlobalizationMode.Invariant ? Invariant.iTwoDigitYearMax : + CallGetCalendarInfoEx(null, calendarId, CAL_ITWODIGITYEARMAX, out int twoDigitYearMax) ? + twoDigitYearMax : + -1; + } } } From 91cd05718ac3a3e271bb466cfc69904c5f66c5c3 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:01:52 -0400 Subject: [PATCH 10/14] Update CalendarData.Unix.cs --- .../src/System/Globalization/CalendarData.Unix.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs index 3af7daa6c91e73..140b6484e30416 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Unix.cs @@ -21,7 +21,7 @@ internal static int GetTwoDigitYearMax(CalendarId calendarId) // There is no user override for this value on Linux or in ICU. // So just return -1 to use the hard-coded defaults. - return -1; + return GlobalizationMode.Invariant ? Invariant.iTwoDigitYearMax : -1; } } } From a243ade106bb02be5e59e21983c68fe8cfe43c77 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Tue, 11 Oct 2022 22:08:23 -0400 Subject: [PATCH 11/14] Move CAL_ITWODIGITYEARMAX; --- .../src/System/Globalization/CalendarData.Nls.cs | 1 - .../src/System/Globalization/CalendarData.Windows.cs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs index ae90d25dce1271..5753747a80bc78 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs @@ -23,7 +23,6 @@ private static bool NlsSystemSupportsTaiwaneseCalendar() private const uint CAL_RETURN_NUMBER = 0x20000000; private const uint CAL_SCALNAME = 0x00000002; - private const uint CAL_ITWODIGITYEARMAX = 0x00000030; private static bool CallGetCalendarInfoEx(string? localeName, CalendarId calendar, uint calType, out int data) { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs index 4301b71ac43a08..917b60fe350f3f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs @@ -23,6 +23,7 @@ internal sealed partial class CalendarData private const uint CAL_SSHORTESTDAYNAME7 = 0x00000037; private const uint CAL_SERASTRING = 0x00000004; private const uint CAL_SABBREVERASTRING = 0x00000039; + private const uint CAL_ITWODIGITYEARMAX = 0x00000030; private const uint ENUM_ALL_CALENDARS = 0xffffffff; From 7cfd57a9fca80e1390b95bd3a9dab2ca7b2fcc33 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:20:55 -0400 Subject: [PATCH 12/14] Update src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs Co-authored-by: Dan Moseley --- .../src/System/Globalization/CalendarData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index 83d8bf7ee3b43a..fa1662b1f5979c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -65,7 +65,7 @@ private static CalendarData CreateInvariant() invariant.sNativeName = "Gregorian Calendar"; // Calendar Name // Year - invariant.iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) + invariant.iTwoDigitYearMax = 2049; // Max 2 digit year invariant.iCurrentEra = 1; // Current era # // Formats From ffc802079c928052f6770fc26087ee4e15c1958d Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Thu, 13 Oct 2022 08:45:15 -0400 Subject: [PATCH 13/14] Updating EastAsianLunisolarCalendar callout --- .../src/System/Globalization/CalendarData.cs | 2 +- .../src/System/Globalization/EastAsianLunisolarCalendar.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs index 83d8bf7ee3b43a..fa1662b1f5979c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.cs @@ -65,7 +65,7 @@ private static CalendarData CreateInvariant() invariant.sNativeName = "Gregorian Calendar"; // Calendar Name // Year - invariant.iTwoDigitYearMax = 2049; // Max 2 digit year (for Y2K bug data entry) + invariant.iTwoDigitYearMax = 2049; // Max 2 digit year invariant.iCurrentEra = 1; // Current era # // Formats diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs index 6e5a322c6d1cb0..1b1122ed9d7686 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs @@ -654,7 +654,7 @@ public override int TwoDigitYearMax { if (_twoDigitYearMax == -1) { - _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, GetYear(new DateTime(DefaultGregorianTwoDigitYearMax, 1, 1))); + _twoDigitYearMax = GetSystemTwoDigitYearSetting(ID, DefaultGregorianTwoDigitYearMax); } return _twoDigitYearMax; From c0f7752055333f8b18c2b4d77a20fc0244705534 Mon Sep 17 00:00:00 2001 From: Connor Bullard <32420624+cdbullard@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:51:50 -0400 Subject: [PATCH 14/14] Update EastAsianLunisolarCalendar.cs --- .../src/System/Globalization/EastAsianLunisolarCalendar.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs index 1b1122ed9d7686..6e5a322c6d1cb0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/EastAsianLunisolarCalendar.cs @@ -654,7 +654,7 @@ public override int TwoDigitYearMax { if (_twoDigitYearMax == -1) { - _twoDigitYearMax = GetSystemTwoDigitYearSetting(ID, DefaultGregorianTwoDigitYearMax); + _twoDigitYearMax = GetSystemTwoDigitYearSetting(BaseCalendarID, GetYear(new DateTime(DefaultGregorianTwoDigitYearMax, 1, 1))); } return _twoDigitYearMax;