Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Value of TwoDigitYearMax to 2049 #76848

Merged
merged 17 commits into from
Oct 22, 2022
Merged

Update Value of TwoDigitYearMax to 2049 #76848

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d132f77
Initial commit
cdbullard Sep 9, 2022
578ee02
Merge branch 'dotnet:main' into twoyearvalue
cdbullard Sep 17, 2022
43ebf1a
Merge branch 'dotnet:main' into twoyearvalue
cdbullard Oct 11, 2022
4873c8b
Updating unit tests
cdbullard Oct 11, 2022
a43ef8b
Removing .sln changes
cdbullard Oct 11, 2022
e5a0630
Update ThaiBuddhistCalendarToFourDigitYear.cs
cdbullard Oct 11, 2022
46950ac
Update System.Globalization.sln
cdbullard Oct 11, 2022
635d695
Update System.Globalization.Calendars.sln
cdbullard Oct 11, 2022
ab97ec0
Remove Y2K and Marshaller comments
cdbullard Oct 11, 2022
527dca2
Adding in OS check for determining whether to use ICU or NLS
cdbullard Oct 11, 2022
ee3b20b
Refactoring code for determining which two digit year max to use (Win…
cdbullard Oct 11, 2022
91cd057
Update CalendarData.Unix.cs
cdbullard Oct 12, 2022
a243ade
Move CAL_ITWODIGITYEARMAX;
cdbullard Oct 12, 2022
7cfd57a
Update src/libraries/System.Private.CoreLib/src/System/Globalization/…
cdbullard Oct 12, 2022
ffc8020
Updating EastAsianLunisolarCalendar callout
cdbullard Oct 13, 2022
a4b25f9
Merge branch 'twoyearvalue' of https://github.com/cdbullard/runtime i…
cdbullard Oct 13, 2022
c0f7752
Update EastAsianLunisolarCalendar.cs
cdbullard Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 51 additions & 44 deletions src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
danmoseley marked this conversation as resolved.
Show resolved Hide resolved
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}"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion ...ystem.Globalization.Calendars/tests/GregorianCalendar/GregorianCalendarTwoDigitYearMax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Globalization.Calendars/tests/KoreanCalendar/KoreanCalendarTwoDigitYearMax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion ...Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarToFourDigitYear.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion ...Globalization.Calendars/tests/ThaiBuddhistCalendar/ThaiBuddhistCalendarTwoDigitYearMax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<object[]> TwoDigitYearMax_Set_TestData()
Expand Down
Loading