Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Update CoreClr, CoreFx, CoreFxOptimizationData, CoreSetup, ProjectNTf…
Browse files Browse the repository at this point in the history 
…s, ProjectNTfsTestILC to preview-27113-01, preview.18563.1, master-20181113-0044, preview-27112-04, beta-27113-00, beta-27113-00, respectively (master)

* Update CoreClr, CoreFx, CoreFxOptimizationData, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview-27113-01, preview.18563.1, master-20181113-0044, preview-27112-04, beta-27113-00, beta-27113-00, respectively (master)

* Removing the Utf8Parser and Utf8Formatter from System.Memory, now that it is in S.P.Corelib

* Fixing the Math/MathF Min and Max tests
  • Loading branch information
@dotnet-maestro-bot @tannergooding
dotnet-maestro-bot authored and tannergooding committed Nov 13, 2018
1 parent 6526265 commit a1bd900
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 920 deletions.
34 changes: 17 additions & 17 deletions eng/dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>8f6558c7dc6384d0341d9bbe45741f0bb035c039</CoreFxCurrentRef>
<CoreClrCurrentRef>8f6558c7dc6384d0341d9bbe45741f0bb035c039</CoreClrCurrentRef>
<CoreSetupCurrentRef>4107975d8819ff8690e655f89044e169c092f614</CoreSetupCurrentRef>
<CoreFxCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</CoreFxCurrentRef>
<CoreClrCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</CoreClrCurrentRef>
<CoreSetupCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>3d83d48dc99e1dc3b90a649c21c01c32a4c45f22</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>3d83d48dc99e1dc3b90a649c21c01c32a4c45f22</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
<BuildToolsCurrentRef>2f9cc14c9526d0f6c292b6ce49f57f4a59c05774</BuildToolsCurrentRef>
<CoreFxOptimizationDataCurrentRef>3d83d48dc99e1dc3b90a649c21c01c32a4c45f22</CoreFxOptimizationDataCurrentRef>
<CoreFxOptimizationDataCurrentRef>8112e1cc84cd60abc1854d5e057eb0085e0de9ab</CoreFxOptimizationDataCurrentRef>
</PropertyGroup>

<!-- Product dependency versions. -->
Expand All @@ -32,16 +32,16 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview.18562.3</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.18562.3</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27112-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27112-03</MicrosoftNetCoreIlasmPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-27112-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-27112-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27112-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27109-05</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27109-05</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27109-05</MicrosoftNETCoreAppPackageVersion>
<CoreFxExpectedPrerelease>preview.18563.1</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.18563.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27113-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27113-01</MicrosoftNetCoreIlasmPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-27113-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-27113-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27113-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27112-04</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27112-04</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27112-04</MicrosoftNETCoreAppPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
Expand All @@ -59,7 +59,7 @@
<TestILCArmretPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCArmretPackageVersion>
<TestILCX86retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCX86retPackageVersion>
<OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
<CoreFxOptimizationDataVersion>99.99.99-master-20181112-0045</CoreFxOptimizationDataVersion>
<CoreFxOptimizationDataVersion>99.99.99-master-20181113-0044</CoreFxOptimizationDataVersion>
</PropertyGroup>

<!-- Package versions used as toolsets -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18556.6",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27112-03"
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27113-01"
}
}
61 changes: 0 additions & 61 deletions src/System.Memory/src/System.Memory.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,67 +27,6 @@
<Compile Include="System\Buffers\Text\Base64Encoder.cs" />
<Compile Include="System\Runtime\InteropServices\SequenceMarshal.cs" />
</ItemGroup>
<!-- Utf8 Formatter/Parser -->
<ItemGroup>
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\StandardFormat.cs" Link="System\Buffers\StandardFormat.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Constants.cs" Link = "System\Buffers\Text\Utf8Constants.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\FormattingHelpers.cs" Link = "System\Buffers\Text\Utf8Formatter\FormattingHelpers.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Boolean.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Boolean.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.G.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.G.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.O.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.O.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.R.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.R.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.L.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.L.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.E.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.E.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.F.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.F.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.G.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.G.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Float.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Float.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Guid.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Guid.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.D.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.D.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.Default.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.Default.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.N.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.N.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.D.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.D.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.Default.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.Default.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.N.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.N.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.X.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.X.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Formatter\Utf8Formatter.TimeSpan.cs" Link = "System\Buffers\Text\Utf8Formatter\Utf8Formatter.TimeSpan.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\ParserHelpers.cs" Link = "System\Buffers\Text\Utf8Parser\ParserHelpers.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Boolean.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Boolean.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Default.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Default.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.G.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.G.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Helpers.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Helpers.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.O.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.O.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.R.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Date.R.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Decimal.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Decimal.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Float.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Float.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Guid.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Guid.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.D.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.D.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.N.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.N.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.D.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.D.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.N.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.N.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.X.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.X.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.Number.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.Number.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.BigG.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.BigG.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.C.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.C.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.LittleG.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.LittleG.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpanSplitter.cs" Link = "System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpanSplitter.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\Buffers\Text\FormattingHelpers.CountDigits.cs" Link = "System\Buffers\Text\FormattingHelpers.CountDigits.cs" />
</ItemGroup>
<!-- Double/Decimal format/parser logic copied (almost verbatim) over from CoreRT -->
<ItemGroup>
<Compile Include="System\Number\Decimal.DecCalc.cs" />
<Compile Include="System\Number\Number.cs" />
<Compile Include="System\Number\Number.FormatAndParse.cs" />
<Compile Include="System\Number\Number.NumberBuffer.cs" />
</ItemGroup>
<ItemGroup>
<!-- Common or Common-branched source files -->
<Compile Include="$(CommonPath)\System\Numerics\Hashing\HashHelpers.cs">
Expand Down
86 changes: 0 additions & 86 deletions src/System.Memory/src/System/Number/Decimal.DecCalc.cs
View file

This file was deleted.

Loading

0 comments on commit a1bd900

Please sign in to comment.