From f6b51c976f16a36d55f550ca0868acbca769d818 Mon Sep 17 00:00:00 2001 From: AndriusK Date: Sun, 29 Sep 2019 16:30:04 +0300 Subject: [PATCH] #4 reverts --- README.md | 12 + external/runtime/runtime.depproj | 10 +- .../CompilerServices/IAsyncStateMachineBox.cs | 24 -- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../src/System.Diagnostics.Debug.csproj | 6 +- .../src/System.IO.Pipelines.csproj | 4 +- src/System.Net.Http/global.json | 17 -- .../shared/CodeAnalysis.ruleset | 205 ------------------ .../src/System.Private.Uri.csproj | 5 +- .../ref/System.Runtime.Manual.cs | 21 +- src/System.Runtime/ref/System.Runtime.csproj | 2 +- .../src/Resources/Strings.resx | 123 ----------- 13 files changed, 44 insertions(+), 389 deletions(-) delete mode 100644 src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs delete mode 100644 src/System.Net.Http/global.json delete mode 100644 src/System.Private.CoreLib/shared/CodeAnalysis.ruleset delete mode 100644 src/System.Text.Encodings.Web/src/Resources/Strings.resx diff --git a/README.md b/README.md index 26b6a118994c..aaccc65c26b8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ +## Fork + problems + +Version 3.0.100 of the .NET Core SDK requires at least version 16.3.0 of MSBuild. +The current available version of MSBuild is 16.1.68.42340. +Change the .NET Core SDK specified in global.json to an older version that requires the MSBuild version currently available. + +Source: +``` +https://github.com/dotnet/corefx -b release/3.0 +https://github.com/dotnet/coreclr -b release/3.0 +``` + # .NET Core Libraries (CoreFX) [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/corefx/corefx-official?branchName=master)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=283&branchName=master) diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 3ce0ed89bc30..d52bc94e8e79 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -1,6 +1,10 @@  $(PackageRID) + netcoreapp3.0 + .NETCoreApp,v3.0 + netcoreapp-Windows_NT-Debug + $(NoWarn);NU1603;NU1605 true @@ -92,8 +96,12 @@ <_CoreLibFilePath>%(_CoreLibFile.FullPath) - <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes')))) + <_CoreLibPackagePath + Condition="$(_CoreLibFilePath.Length) > 0" + >$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes')))) + + diff --git a/src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs b/src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs deleted file mode 100644 index bb09d35dd7da..000000000000 --- a/src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace System.Runtime.CompilerServices -{ - /// - /// An interface implemented by all instances, regardless of generics. - /// - internal interface IAsyncStateMachineBox - { - /// Move the state machine forward. - void MoveNext(); - - /// - /// Gets an action for moving forward the contained state machine. - /// This will lazily-allocate the delegate as needed. - /// - Action MoveNextAction { get; } - - /// Gets the state machine as a boxed object. This should only be used for debugging purposes. - IAsyncStateMachine GetStateMachineObject(); - } -} diff --git a/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props b/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props index 52ffcc26f89e..2f87c4e4307d 100644 --- a/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props +++ b/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props @@ -1,8 +1,8 @@ - 1.2.0 1.0.0.0 + 1.0.0 Open diff --git a/src/Microsoft.Bcl.HashCode/Directory.Build.props b/src/Microsoft.Bcl.HashCode/Directory.Build.props index 52ffcc26f89e..2f87c4e4307d 100644 --- a/src/Microsoft.Bcl.HashCode/Directory.Build.props +++ b/src/Microsoft.Bcl.HashCode/Directory.Build.props @@ -1,8 +1,8 @@ - 1.2.0 1.0.0.0 + 1.0.0 Open diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index cc28eed79853..05c697d9db0a 100644 --- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj @@ -1,11 +1,13 @@ false - + true + true + {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8} System.Diagnostics.Debug true - netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug; + netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug diff --git a/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 7cfa3f14971e..c537773c3d29 100644 --- a/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,7 +1,7 @@  {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} - netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Release;netstandard-Debug;netstandard-Release @@ -37,7 +37,7 @@ - + diff --git a/src/System.Net.Http/global.json b/src/System.Net.Http/global.json deleted file mode 100644 index 649f6694b0b7..000000000000 --- a/src/System.Net.Http/global.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "sdk": { - "version": "3.0.100-preview7-012821", - "rollforward": "major" - }, - "tools": { - "dotnet": "3.0.100-preview7-012821" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19456.10", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19456.10", - "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19456.10", - "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19456.10", - "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19456.2" - } -} diff --git a/src/System.Private.CoreLib/shared/CodeAnalysis.ruleset b/src/System.Private.CoreLib/shared/CodeAnalysis.ruleset deleted file mode 100644 index 975613f0641d..000000000000 --- a/src/System.Private.CoreLib/shared/CodeAnalysis.ruleset +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj index 37a2eacec4b8..46dd912c0617 100644 --- a/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -1,10 +1,13 @@  {4AC5343E-6E31-4BA5-A795-0493AE7E9008} + + netcoreapp3.0 System.Private.Uri true enable - netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release + netcoreapp-Unix-Debug;netcoreapp-Windows_NT-Debug + diff --git a/src/System.Runtime/ref/System.Runtime.Manual.cs b/src/System.Runtime/ref/System.Runtime.Manual.cs index 89107df9dfdc..2aa2d8e9e2c0 100644 --- a/src/System.Runtime/ref/System.Runtime.Manual.cs +++ b/src/System.Runtime/ref/System.Runtime.Manual.cs @@ -9,31 +9,30 @@ namespace System { public partial struct Double { - public const double MaxValue = 1.7976931348623157E+308; public const double MinValue = -1.7976931348623157E+308; + public const double MaxValue = 1.7976931348623157E+308; // Note Epsilon should be a double whose hex representation is 0x1 // on little endian machines. public const double Epsilon = 4.9406564584124654E-324; - public const double NaN = 0.0 / 0.0; - public const double NegativeInfinity = -1.0 / 0.0; - public const double PositiveInfinity = 1.0 / 0.0; + public const double NegativeInfinity = (double)-1.0 / (double)(0.0); + public const double PositiveInfinity = (double)1.0 / (double)(0.0); + public const double NaN = (double)0.0 / (double)0.0; } public partial struct Single { - public const float Epsilon = 1.4E-45f; - public const float MaxValue = 3.40282346638528859E+38f; - public const float MinValue = -3.40282346638528859E+38f; - public const float NaN = 0.0f / 0.0f; - public const float NegativeInfinity = -1.0f / 0.0f; - public const float PositiveInfinity = 1.0f / 0.0f; + public const float MinValue = (float)-3.40282346638528859e+38; + public const float Epsilon = (float)1.4e-45; + public const float MaxValue = (float)3.40282346638528859e+38; + public const float PositiveInfinity = (float)1.0 / (float)0.0; + public const float NegativeInfinity = (float)-1.0 / (float)0.0; + public const float NaN = (float)0.0 / (float)0.0; } public ref partial struct TypedReference { // We need to add this into the manual ref assembly to preserve it because the // implementation doesn't have any reference field, hence GenApi will not emit it. private object _dummy; - // Placing the value type field in the manual ref as well to avoid the error CS0282: There is no defined ordering between fields in multiple declarations of partial struct 'TypedReference'. private int _dummyPrimitive; } } diff --git a/src/System.Runtime/ref/System.Runtime.csproj b/src/System.Runtime/ref/System.Runtime.csproj index c34b405e9c5e..6bce159158f3 100644 --- a/src/System.Runtime/ref/System.Runtime.csproj +++ b/src/System.Runtime/ref/System.Runtime.csproj @@ -1,6 +1,6 @@ - netstandard2.0;coreapp3.0 + netstandard2.0;netcoreapp3.0 false true diff --git a/src/System.Text.Encodings.Web/src/Resources/Strings.resx b/src/System.Text.Encodings.Web/src/Resources/Strings.resx deleted file mode 100644 index 2a0d862e3989..000000000000 --- a/src/System.Text.Encodings.Web/src/Resources/Strings.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TextEncoder does not implement MaxOutputCharsPerInputChar correctly. - - \ No newline at end of file