Update SDK min and target version to >= Preview8 (#41947)

* Update SDK min and target version to >= Preview8
dotnet · Sep 10, 2020 · ad434fc · ad434fc
1 parent b443d6e
commit ad434fc
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -110,9 +110,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <!-- Determine what architecture we are building on. -->
     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
-
-    <!-- Turn off end of life target framework check as we still build for nca2.0 and nca3.0 some OOB libraries -->
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />

diff --git a/eng/Configurations.props b/eng/Configurations.props
@@ -68,5 +68,7 @@
     <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
     <!-- Enable NuGet static graph evaluation to optimize incremental restore -->
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+    <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -46,7 +46,7 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20431.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20453.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
     </Dependency>

diff --git a/global.json b/global.json
@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "5.0.100-preview.8.20362.3",
+    "version": "5.0.100-preview.8.20417.9",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "5.0.100-preview.8.20362.3"
+    "dotnet": "5.0.100-rc.1.20454.5"
   },
   "native-tools": {
     "cmake": "3.14.5",
     "python3": "3.7.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20431.4",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20459.1",
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4",
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4",

diff --git a/...braries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/...braries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <!-- NuGet restore issue with TargetFrameworks in f# projects: https://github.com/NuGet/Home/issues/10005 -->
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,4 +15,4 @@
   <ItemGroup>
       <ProjectReference Include="..\..\src\System.Formats.Cbor.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
@@ -122,7 +122,6 @@
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />

diff --git a/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <TargetPlatformMinVersion>10.0.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile44</TargetFrameworkProfile>
+  </PropertyGroup>
+</Project>
diff --git a/...st/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets b/...st/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <!-- Utf8String reference depends on System.Private.CoreLib on net5.0 so we can't run
+         Verify Closure on it. -->
+    <ShouldVerifyClosure>false</ShouldVerifyClosure>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <_targetFrameworkVersionIndex>$(TargetFramework.IndexOfAny(".-0123456789"))</_targetFrameworkVersionIndex>
     <_targetFrameworkIdentifier Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(TargetFramework.SubString(0, $(_targetFrameworkVersionIndex)))</_targetFrameworkIdentifier>
+    <!-- For net5.0 and later use netcoreapp folder. -->
+    <_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == 'net' and !$(TargetFramework.StartsWith('net4'))">netcoreapp</_targetFrameworkIdentifier>
     <ToolsDir>$(MSBuildThisFileDirectory)tools\</ToolsDir>
 
     <RestoreSources>

diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template
@@ -5,6 +5,8 @@
     <RuntimeIdentifiers>{RIDs}</RuntimeIdentifiers>
     <TestPackageId>{PackageId}</TestPackageId>
     <TestPackageVersion>{PackageVersion}</TestPackageVersion>
+    <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
     <SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support</SupportFilesDir>
   </PropertyGroup>

diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj
@@ -7,7 +7,7 @@
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mutual_recursion.fs" />