dotnet#4 reverts

akrisiun · Sep 29, 2019 · f6b51c9 · f6b51c9
1 parent 3aa6ea3
commit f6b51c9
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 389 deletions.
diff --git 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
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
+	<TargetFramework>netcoreapp3.0</TargetFramework>
+	<TargetFrameworkMoniker>.NETCoreApp,v3.0</TargetFrameworkMoniker>
+	<Configurations>netcoreapp-Windows_NT-Debug</Configurations>
+
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
     <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' AND ('$(ConfigurationGroup)' == 'Debug' OR '$(Coverage)' == 'true')">true</SwapNativeForIL>
     <!-- uap10.0.16299 is missing IL -->
@@ -92,8 +96,12 @@
     </ItemGroup>
     <PropertyGroup>
       <_CoreLibFilePath>%(_CoreLibFile.FullPath)</_CoreLibFilePath>
-      <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath>
+      <_CoreLibPackagePath
+		Condition="$(_CoreLibFilePath.Length) > 0"
+		>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath>
     </PropertyGroup>
+
+	<Message Importance="High" Text="~  _CoreLibPackagePath=$(_CoreLibPackagePath)" />
     <Error Condition="'$(_CoreLibPackagePath)' == '' OR !Exists('$(_CoreLibPackagePath)')" 
            Text="Could not locate the CoreClr package." />
   </Target>

diff --git a/src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs b/src/Common/src/CoreLib/System/Runtime/CompilerServices/IAsyncStateMachineBox.cs
diff --git a/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props b/src/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.2.0</PackageVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <PackageVersion>1.0.0</PackageVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
   </PropertyGroup>

diff --git a/src/Microsoft.Bcl.HashCode/Directory.Build.props b/src/Microsoft.Bcl.HashCode/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.2.0</PackageVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <PackageVersion>1.0.0</PackageVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
   </PropertyGroup>

diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
-
+	<SkipDeriveTargetFrameworks>true</SkipDeriveTargetFrameworks>  
+	<BuildAnkh>true</BuildAnkh>
+
     <ProjectGuid>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</ProjectGuid>
     <AssemblyName>System.Diagnostics.Debug</AssemblyName>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;</Configurations>
+    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />

diff --git a/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}</ProjectGuid>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Release;netstandard-Debug;netstandard-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)\CoreLib\System\Threading\Tasks\TaskToApm.cs">
@@ -37,7 +37,7 @@
     <Compile Include="System\IO\Pipelines\StreamPipeWriterOptions.cs" />
     <Compile Include="System\IO\Pipelines\ThrowHelper.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)'=='true'">
+  <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'">
     <Compile Include="System\IO\Pipelines\ThreadPoolScheduler.netcoreapp.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='netstandard'">

diff --git a/src/System.Net.Http/global.json b/src/System.Net.Http/global.json