Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions eng/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>c9274882c2f1e70586d6bffd6edb91833cc41ebd</CoreFxCurrentRef>
<CoreClrCurrentRef>c9274882c2f1e70586d6bffd6edb91833cc41ebd</CoreClrCurrentRef>
<ProjectNTfsCurrentRef>9ac7399739f61f6e5b5a159b000a71006641a751</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>9ac7399739f61f6e5b5a159b000a71006641a751</ProjectNTfsTestILCCurrentRef>
<CoreFxCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreFxCurrentRef>
<CoreClrCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreClrCurrentRef>
<ProjectNTfsCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
<BuildToolsCurrentRef>984a541f1d8f243a704fe4074e4b60c6cc3278f7</BuildToolsCurrentRef>
Expand All @@ -30,13 +30,13 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview.19063.1</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19063.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27312-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27312-01</MicrosoftNetCoreIlasmPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-27311-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-27311-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27311-00</ProjectNTfsTestILCPackageVersion>
<CoreFxExpectedPrerelease>preview.19064.4</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19064.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27315-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27315-01</MicrosoftNetCoreIlasmPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-27315-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-27315-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27315-00</ProjectNTfsTestILCPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19064.4",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19064.4",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27312-01"
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27315-01"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<ItemGroup Condition="'$(TargetsAOT)'!='true'">
<Compile Include="System\Diagnostics\StackFrameExtensions.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsAOT)'=='true'">
<Compile Include="System\Diagnostics\SymbolStore\ISymbolDocumentWriter.cs" />
</ItemGroup>
<ItemGroup>
<ReferenceFromRuntime Include="System.Private.CoreLib" />
</ItemGroup>
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion src/System.Memory/src/ApiCompatBaseline.uapaot.txt

This file was deleted.

1 change: 0 additions & 1 deletion src/System.Memory/src/System.Memory.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<Compile Include="System\Buffers\BuffersExtensions.cs" />
<Compile Include="System\Buffers\IBufferWriter.cs" />
<Compile Include="System\Buffers\MemoryPool.cs" />
<Compile Include="System\Buffers\OperationStatus.cs" Condition="'$(TargetsAot)' == 'true'" /> <!-- TODO: Delete once .NET Native has OperationStatus in CoreLib -->
<Compile Include="System\Buffers\ReadOnlySequence.cs" />
<Compile Include="System\Buffers\ReadOnlySequenceDebugView.cs" />
<Compile Include="System\Buffers\ReadOnlySequenceSegment.cs" />
Expand Down
34 changes: 0 additions & 34 deletions src/System.Memory/src/System/Buffers/OperationStatus.cs

This file was deleted.

35 changes: 29 additions & 6 deletions src/System.Runtime/tests/System/TimeSpanTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,14 @@ public static IEnumerable<object[]> Parse_Valid_TestData()
yield return new object[] { "1:1:1.00001", CultureInfo.InvariantCulture, new TimeSpan(36610000100) };
yield return new object[] { "1:1:1.000001", CultureInfo.InvariantCulture, new TimeSpan(36610000010) };
yield return new object[] { "1:1:1.0000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };
yield return new object[] { "1:1:1.00000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };

if (PlatformDetection.IsFullFramework)
{
// Full framework can produce some incorrect results in some cases involving leading zeros when
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
// have more net core tests to validate the correct the results.
yield return new object[] { "1:1:1.00000001", CultureInfo.InvariantCulture, new TimeSpan(36610000001) };
}

// DD.HH:MM:SS
yield return new object[] { "1.12:24:02", null, new TimeSpan(1, 12, 24, 2, 0) };
Expand All @@ -560,7 +567,14 @@ public static IEnumerable<object[]> Parse_Valid_TestData()
yield return new object[] { "1:1:.00001", CultureInfo.InvariantCulture, new TimeSpan(36600000100) };
yield return new object[] { "1:1:.000001", CultureInfo.InvariantCulture, new TimeSpan(36600000010) };
yield return new object[] { "1:1:.0000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };
yield return new object[] { "1:1:.00000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };

if (PlatformDetection.IsFullFramework)
{
// Full framework can produce some incorrect results in some cases involving leading zeros when
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
// have more net core tests to validate the correct the results.
yield return new object[] { "1:1:.00000001", CultureInfo.InvariantCulture, new TimeSpan(36600000001) };
}

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

// OverflowExceptions
yield return new object[] { "1:1:1.99999999", null, typeof(OverflowException) }; // overflowing fraction
yield return new object[] { "1:1:1.000000001", null, typeof(OverflowException) }; // too many leading zeroes in fraction

if (PlatformDetection.IsFullFramework)
{
// on non full framework we now succeed parsing the fraction .000000001
// Full framework can produce some incorrect results in some cases involving leading zeros when
// parsing fraction more than 7 digits. we test the expected full framework results here and we have
// have more net core tests to validate the correct the results.
yield return new object[] { "1:1:1.000000001", null, typeof(OverflowException) }; // too many leading zeroes in fraction
}

yield return new object[] { "2147483647", null, typeof(OverflowException) }; // overflowing value == int.MaxValue
yield return new object[] { "2147483648", null, typeof(OverflowException) }; // overflowing value == int.MaxValue + 1
yield return new object[] { "10675200", null, typeof(OverflowException) }; // overflowing number of days
Expand Down Expand Up @@ -809,15 +832,15 @@ public static void ParseExactTest_Invalid(string input, string format, Type exce
{
Assert.Throws(exceptionType, () => TimeSpan.ParseExact(input, format, new CultureInfo("en-US")));
Assert.Throws(exceptionType, () => TimeSpan.ParseExact(input, format, new CultureInfo("en-US"), TimeSpanStyles.None));

Type exceptionTypeMultiple = exceptionType == typeof(OverflowException) || string.IsNullOrEmpty(format) ? typeof(FormatException) : exceptionType;
Assert.Throws(exceptionTypeMultiple, () => TimeSpan.ParseExact(input, new string[] { format }, new CultureInfo("en-US")));
Assert.Throws(exceptionTypeMultiple, () => TimeSpan.ParseExact(input, new string[] { format }, new CultureInfo("en-US"), TimeSpanStyles.None));

TimeSpan result;
Assert.False(TimeSpan.TryParseExact(input, format, new CultureInfo("en-US"), out result));
Assert.Equal(TimeSpan.Zero, result);

Assert.False(TimeSpan.TryParseExact(input, format, new CultureInfo("en-US"), TimeSpanStyles.None, out result));
Assert.Equal(TimeSpan.Zero, result);

Expand Down
24 changes: 24 additions & 0 deletions src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,30 @@ private static IEnumerable<object[]> MultiplicationTestData()
yield return new object[] {TimeSpan.MaxValue, 0.5, TimeSpan.FromTicks((long)(long.MaxValue * 0.5))};
}

// ParseDifferentLengthFractionWithLeadingZerosData mainly testing the behavior we have fixed in net core
// which is the way we normalize the parsed fraction and possibly rounding it.
private static IEnumerable<object[]> ParseDifferentLengthFractionWithLeadingZerosData()
{
yield return new object[] {"00:00:00.00000001", new TimeSpan(0)};
yield return new object[] {"00:00:00.00000005", new TimeSpan(1)};
yield return new object[] {"00:00:00.09999999", new TimeSpan(1_000_000)};
yield return new object[] {"00:00:00.0268435455", new TimeSpan(268435)};
yield return new object[] {"00:00:00.01", new TimeSpan(1_00_000)};
yield return new object[] {"0:00:00.01000000", new TimeSpan(100_000)};
yield return new object[] {"0:00:00.010000000", new TimeSpan(100_000)};
yield return new object[] {"0:00:00.0123456", new TimeSpan(123456)};
yield return new object[] {"0:00:00.00123456", new TimeSpan(12346)};
yield return new object[] {"0:00:00.00000098", new TimeSpan(10)};
yield return new object[] {"0:00:00.00000099", new TimeSpan(10)};
}

[Theory, MemberData(nameof(ParseDifferentLengthFractionWithLeadingZerosData))]
public static void Multiplication(string input, TimeSpan expected)
{
Assert.Equal(expected, TimeSpan.Parse(input, CultureInfo.InvariantCulture));
Assert.Equal(expected, TimeSpan.ParseExact(input, "g", CultureInfo.InvariantCulture));
}

[Theory, MemberData(nameof(MultiplicationTestData))]
public static void Multiplication(TimeSpan timeSpan, double factor, TimeSpan expected)
{
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions src/System.Threading.Tasks/src/ApiCompatBaseline.uapaot.txt

This file was deleted.

3 changes: 0 additions & 3 deletions src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetsAot)' == 'true'"> <!-- TODO: Remove after .NET Native bits contain ConfiguredCancelableAsyncEnumerable -->
<Compile Include="$(CommonPath)\CoreLib\System\Runtime\CompilerServices\ConfiguredCancelableAsyncEnumerable.cs" />
</ItemGroup>
<ItemGroup>
<ReferenceFromRuntime Include="System.Private.CoreLib" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/shims/ApiCompatBaseline.uapaot.netstandard20.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ TypesMustExist : Type 'System.Buffers.Binary.BinaryPrimitives' does not exist in
TypesMustExist : Type 'System.Buffers.StandardFormat' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Buffers.Text.Utf8Formatter' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Buffers.Text.Utf8Parser' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Buffers.OperationStatus' does not exist in the implementation but it does exist in the contract.

CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultEventAttribute' exists on 'System.ComponentModel.BackgroundWorker' in the contract but not the implementation.
CannotChangeAttribute : Attribute 'System.Diagnostics.SwitchLevelAttribute' on 'System.Diagnostics.BooleanSwitch' changed from '[SwitchLevelAttribute(typeof(bool))]' in the contract to '[SwitchLevelAttribute(typeof(Boolean))]' in the implementation.
Expand Down