Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 2fde649

Browse files
authored
Merge pull request #34596 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC to preview-27315-02, preview.19065.1, beta-27315-00, beta-27315-00, respectively (master)
2 parents c0da1a5 + 94c43e1 commit 2fde649

File tree

13 files changed

+65
-77
lines changed

13 files changed

+65
-77
lines changed

eng/dependencies.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
These ref versions are pulled from https://github.com/dotnet/versions.
1010
-->
1111
<PropertyGroup>
12-
<CoreFxCurrentRef>c9274882c2f1e70586d6bffd6edb91833cc41ebd</CoreFxCurrentRef>
13-
<CoreClrCurrentRef>c9274882c2f1e70586d6bffd6edb91833cc41ebd</CoreClrCurrentRef>
14-
<ProjectNTfsCurrentRef>9ac7399739f61f6e5b5a159b000a71006641a751</ProjectNTfsCurrentRef>
15-
<ProjectNTfsTestILCCurrentRef>9ac7399739f61f6e5b5a159b000a71006641a751</ProjectNTfsTestILCCurrentRef>
12+
<CoreFxCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreFxCurrentRef>
13+
<CoreClrCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreClrCurrentRef>
14+
<ProjectNTfsCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsCurrentRef>
15+
<ProjectNTfsTestILCCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsTestILCCurrentRef>
1616
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
1717
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
1818
<BuildToolsCurrentRef>984a541f1d8f243a704fe4074e4b60c6cc3278f7</BuildToolsCurrentRef>
@@ -30,13 +30,13 @@
3030

3131
<!-- Tests/infrastructure dependency versions. -->
3232
<PropertyGroup>
33-
<CoreFxExpectedPrerelease>preview.19063.1</CoreFxExpectedPrerelease>
34-
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19063.1</MicrosoftNETCorePlatformsPackageVersion>
35-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27312-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
36-
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27312-01</MicrosoftNetCoreIlasmPackageVersion>
37-
<ProjectNTfsExpectedPrerelease>beta-27311-00</ProjectNTfsExpectedPrerelease>
38-
<ProjectNTfsTestILCExpectedPrerelease>beta-27311-00</ProjectNTfsTestILCExpectedPrerelease>
39-
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27311-00</ProjectNTfsTestILCPackageVersion>
33+
<CoreFxExpectedPrerelease>preview.19064.4</CoreFxExpectedPrerelease>
34+
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19064.4</MicrosoftNETCorePlatformsPackageVersion>
35+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27315-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
36+
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27315-01</MicrosoftNetCoreIlasmPackageVersion>
37+
<ProjectNTfsExpectedPrerelease>beta-27315-00</ProjectNTfsExpectedPrerelease>
38+
<ProjectNTfsTestILCExpectedPrerelease>beta-27315-00</ProjectNTfsTestILCExpectedPrerelease>
39+
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27315-00</ProjectNTfsTestILCPackageVersion>
4040

4141
<!-- CoreFX-built SNI identity package -->
4242
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"msbuild-sdks": {
66
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19064.4",
77
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19064.4",
8-
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27312-01"
8+
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27315-01"
99
}
1010
}

src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
<ItemGroup Condition="'$(TargetsAOT)'!='true'">
3939
<Compile Include="System\Diagnostics\StackFrameExtensions.cs" />
4040
</ItemGroup>
41-
<ItemGroup Condition="'$(TargetsAOT)'=='true'">
42-
<Compile Include="System\Diagnostics\SymbolStore\ISymbolDocumentWriter.cs" />
43-
</ItemGroup>
4441
<ItemGroup>
4542
<ReferenceFromRuntime Include="System.Private.CoreLib" />
4643
</ItemGroup>

src/System.Diagnostics.StackTrace/src/System/Diagnostics/SymbolStore/ISymbolDocumentWriter.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/System.Memory/src/ApiCompatBaseline.uapaot.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/System.Memory/src/System.Memory.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<Compile Include="System\Buffers\BuffersExtensions.cs" />
1414
<Compile Include="System\Buffers\IBufferWriter.cs" />
1515
<Compile Include="System\Buffers\MemoryPool.cs" />
16-
<Compile Include="System\Buffers\OperationStatus.cs" Condition="'$(TargetsAot)' == 'true'" /> <!-- TODO: Delete once .NET Native has OperationStatus in CoreLib -->
1716
<Compile Include="System\Buffers\ReadOnlySequence.cs" />
1817
<Compile Include="System\Buffers\ReadOnlySequenceDebugView.cs" />
1918
<Compile Include="System\Buffers\ReadOnlySequenceSegment.cs" />

src/System.Memory/src/System/Buffers/OperationStatus.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/System.Runtime/tests/System/TimeSpanTests.cs

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,14 @@ public static IEnumerable<object[]> Parse_Valid_TestData()
538538
yield return new object[] { "1:1:1.00001", CultureInfo.InvariantCulture, new TimeSpan(36610000100) };
539539
yield return new object[] { "1:1:1.000001", CultureInfo.InvariantCulture, new TimeSpan(36610000010) };
540540
yield return new object[] { "1:1:1.0000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };
541-
yield return new object[] { "1:1:1.00000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };
541+
542+
if (PlatformDetection.IsFullFramework)
543+
{
544+
// Full framework can produce some incorrect results in some cases involving leading zeros when
545+
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
546+
// have more net core tests to validate the correct the results.
547+
yield return new object[] { "1:1:1.00000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };
548+
}
542549

543550
// DD.HH:MM:SS
544551
yield return new object[] { "1.12:24:02", null, new TimeSpan(1, 12, 24, 2, 0) };
@@ -560,7 +567,14 @@ public static IEnumerable<object[]> Parse_Valid_TestData()
560567
yield return new object[] { "1:1:.00001", CultureInfo.InvariantCulture, new TimeSpan(36600000100) };
561568
yield return new object[] { "1:1:.000001", CultureInfo.InvariantCulture, new TimeSpan(36600000010) };
562569
yield return new object[] { "1:1:.0000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };
563-
yield return new object[] { "1:1:.00000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };
570+
571+
if (PlatformDetection.IsFullFramework)
572+
{
573+
// Full framework can produce some incorrect results in some cases involving leading zeros when
574+
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
575+
// have more net core tests to validate the correct the results.
576+
yield return new object[] { "1:1:.00000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };
577+
}
564578

565579
// Just below overflow on various components
566580
yield return new object[] { "10675199", null, new TimeSpan(9223371936000000000) };
@@ -625,7 +639,16 @@ public static IEnumerable<object[]> Parse_Invalid_TestData()
625639

626640
// OverflowExceptions
627641
yield return new object[] { "1:1:1.99999999", null, typeof(OverflowException) }; // overflowing fraction
628-
yield return new object[] { "1:1:1.000000001", null, typeof(OverflowException) }; // too many leading zeroes in fraction
642+
643+
if (PlatformDetection.IsFullFramework)
644+
{
645+
// on non full framework we now succeed parsing the fraction .000000001
646+
// Full framework can produce some incorrect results in some cases involving leading zeros when
647+
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
648+
// have more net core tests to validate the correct the results.
649+
yield return new object[] { "1:1:1.000000001", null, typeof(OverflowException) }; // too many leading zeroes in fraction
650+
}
651+
629652
yield return new object[] { "2147483647", null, typeof(OverflowException) }; // overflowing value == int.MaxValue
630653
yield return new object[] { "2147483648", null, typeof(OverflowException) }; // overflowing value == int.MaxValue + 1
631654
yield return new object[] { "10675200", null, typeof(OverflowException) }; // overflowing number of days
@@ -809,15 +832,15 @@ public static void ParseExactTest_Invalid(string input, string format, Type exce
809832
{
810833
Assert.Throws(exceptionType, () => TimeSpan.ParseExact(input, format, new CultureInfo("en-US")));
811834
Assert.Throws(exceptionType, () => TimeSpan.ParseExact(input, format, new CultureInfo("en-US"), TimeSpanStyles.None));
812-
835+
813836
Type exceptionTypeMultiple = exceptionType == typeof(OverflowException) || string.IsNullOrEmpty(format) ? typeof(FormatException) : exceptionType;
814837
Assert.Throws(exceptionTypeMultiple, () => TimeSpan.ParseExact(input, new string[] { format }, new CultureInfo("en-US")));
815838
Assert.Throws(exceptionTypeMultiple, () => TimeSpan.ParseExact(input, new string[] { format }, new CultureInfo("en-US"), TimeSpanStyles.None));
816-
839+
817840
TimeSpan result;
818841
Assert.False(TimeSpan.TryParseExact(input, format, new CultureInfo("en-US"), out result));
819842
Assert.Equal(TimeSpan.Zero, result);
820-
843+
821844
Assert.False(TimeSpan.TryParseExact(input, format, new CultureInfo("en-US"), TimeSpanStyles.None, out result));
822845
Assert.Equal(TimeSpan.Zero, result);
823846

src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,30 @@ private static IEnumerable<object[]> MultiplicationTestData()
2222
yield return new object[] {TimeSpan.MaxValue, 0.5, TimeSpan.FromTicks((long)(long.MaxValue * 0.5))};
2323
}
2424

25+
// ParseDifferentLengthFractionWithLeadingZerosData mainly testing the behavior we have fixed in net core
26+
// which is the way we normalize the parsed fraction and possibly rounding it.
27+
private static IEnumerable<object[]> ParseDifferentLengthFractionWithLeadingZerosData()
28+
{
29+
yield return new object[] {"00:00:00.00000001", new TimeSpan(0)};
30+
yield return new object[] {"00:00:00.00000005", new TimeSpan(1)};
31+
yield return new object[] {"00:00:00.09999999", new TimeSpan(1_000_000)};
32+
yield return new object[] {"00:00:00.0268435455", new TimeSpan(268435)};
33+
yield return new object[] {"00:00:00.01", new TimeSpan(1_00_000)};
34+
yield return new object[] {"0:00:00.01000000", new TimeSpan(100_000)};
35+
yield return new object[] {"0:00:00.010000000", new TimeSpan(100_000)};
36+
yield return new object[] {"0:00:00.0123456", new TimeSpan(123456)};
37+
yield return new object[] {"0:00:00.00123456", new TimeSpan(12346)};
38+
yield return new object[] {"0:00:00.00000098", new TimeSpan(10)};
39+
yield return new object[] {"0:00:00.00000099", new TimeSpan(10)};
40+
}
41+
42+
[Theory, MemberData(nameof(ParseDifferentLengthFractionWithLeadingZerosData))]
43+
public static void Multiplication(string input, TimeSpan expected)
44+
{
45+
Assert.Equal(expected, TimeSpan.Parse(input, CultureInfo.InvariantCulture));
46+
Assert.Equal(expected, TimeSpan.ParseExact(input, "g", CultureInfo.InvariantCulture));
47+
}
48+
2549
[Theory, MemberData(nameof(MultiplicationTestData))]
2650
public static void Multiplication(TimeSpan timeSpan, double factor, TimeSpan expected)
2751
{

src/System.Threading.Tasks/src/ApiCompatBaseline.netcoreappaot.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)