Skip to content

Commit ad434fc

Browse files
ViktorHoferViktorHofer
authored
Update SDK min and target version to >= Preview8 (#41947)
* Update SDK min and target version to >= Preview8
1 parent b443d6e commit ad434fc

File tree

16 files changed

+61
-10
lines changed

16 files changed

+61
-10
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@
110110
<AppDesignerFolder>Properties</AppDesignerFolder>
111111
<!-- Determine what architecture we are building on. -->
112112
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
113-
114-
<!-- Turn off end of life target framework check as we still build for nca2.0 and nca3.0 some OOB libraries -->
115-
<CheckEolTargetFramework>false</CheckEolTargetFramework>
116113
</PropertyGroup>
117114

118115
<Import Project="$(RepositoryEngineeringDir)Analyzers.props" />

‎eng/Configurations.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@
6868
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
6969
<!-- Enable NuGet static graph evaluation to optimize incremental restore -->
7070
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
71+
<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
72+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
7173
</PropertyGroup>
7274
</Project>

‎eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Uri>https://github.com/dotnet/arcade</Uri>
4747
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20431.4">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20453.7">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
5151
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
5252
</Dependency>

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "5.0.100-preview.8.20362.3",
3+
"version": "5.0.100-preview.8.20417.9",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "5.0.100-preview.8.20362.3"
8+
"dotnet": "5.0.100-rc.1.20454.5"
99
},
1010
"native-tools": {
1111
"cmake": "3.14.5",
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20431.4",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20459.1",
1616
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4",
1717
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6",
1818
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4",

‎src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
5+
<!-- NuGet restore issue with TargetFrameworks in f# projects: https://github.com/NuGet/Home/issues/10005 -->
6+
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
57
</PropertyGroup>
68

79
<ItemGroup>
@@ -13,4 +15,4 @@
1315
<ItemGroup>
1416
<ProjectReference Include="..\..\src\System.Formats.Cbor.csproj" />
1517
</ItemGroup>
16-
</Project>
18+
</Project>

‎src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
123123
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
124124
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
125-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
126125
</ItemGroup>
127126
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
128127
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />

‎src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetPlatformMinVersion>10.0.0</TargetPlatformMinVersion>
4+
</PropertyGroup>
5+
</Project>

‎src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
4+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
5+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
4+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
5+
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
4+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
5+
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
4+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
5+
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
4+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
5+
<TargetFrameworkProfile>Profile44</TargetFrameworkProfile>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Utf8String reference depends on System.Private.CoreLib on net5.0 so we can't run
4+
Verify Closure on it. -->
5+
<ShouldVerifyClosure>false</ShouldVerifyClosure>
6+
</PropertyGroup>
7+
</Project>

‎src/libraries/pkg/test/packageTest.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<PropertyGroup>
44
<_targetFrameworkVersionIndex>$(TargetFramework.IndexOfAny(".-0123456789"))</_targetFrameworkVersionIndex>
55
<_targetFrameworkIdentifier Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(TargetFramework.SubString(0, $(_targetFrameworkVersionIndex)))</_targetFrameworkIdentifier>
6+
<!-- For net5.0 and later use netcoreapp folder. -->
7+
<_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == 'net' and !$(TargetFramework.StartsWith('net4'))">netcoreapp</_targetFrameworkIdentifier>
68
<ToolsDir>$(MSBuildThisFileDirectory)tools\</ToolsDir>
79

810
<RestoreSources>

‎src/libraries/pkg/test/project.csproj.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<RuntimeIdentifiers>{RIDs}</RuntimeIdentifiers>
66
<TestPackageId>{PackageId}</TestPackageId>
77
<TestPackageVersion>{PackageVersion}</TestPackageVersion>
8+
<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
9+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
810

911
<SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support</SupportFilesDir>
1012
</PropertyGroup>

‎src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Noconfig>True</Noconfig>
88
<Optimize>True</Optimize>
99
<JitOptimizationSensitive>True</JitOptimizationSensitive>
10-
<TargetFramework>netcoreapp3.1</TargetFramework>
10+
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<Compile Include="mutual_recursion.fs" />

0 commit comments

Comments
 (0)