Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 26 commits into from
Sep 10, 2020
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
84fd491
Update SDK min and target version to >= Preview8
ViktorHofer Sep 7, 2020
c6049ac
fsproj restore workaround
ViktorHofer Sep 7, 2020
975d6e2
Update global.json
ViktorHofer Sep 7, 2020
3ab02c7
Update global.json
ViktorHofer Sep 7, 2020
a275e0f
Update Version.Details.xml
ViktorHofer Sep 7, 2020
4db5568
Use RC1 final
ViktorHofer Sep 8, 2020
33f132e
Update global.json
ViktorHofer Sep 8, 2020
a9263e5
Update System.Formats.Cbor.Tests.DataModel.fsproj
ViktorHofer Sep 8, 2020
ebad5f8
Update System.Formats.Cbor.Tests.DataModel.fsproj
ViktorHofer Sep 8, 2020
c474c4e
Update global.json
ViktorHofer Sep 8, 2020
c4debb6
Update global.json
ViktorHofer Sep 8, 2020
47a794f
Update System.Formats.Cbor.Tests.DataModel.fsproj
ViktorHofer Sep 8, 2020
3522470
Update TargetFramework.Sdk
ViktorHofer Sep 9, 2020
231146b
Remove duplicate ProjectReference
ViktorHofer Sep 9, 2020
b313c2f
Remove unnecessary CoreLib project build in src.proj
ViktorHofer Sep 9, 2020
4bf2229
Move EOL check to an installer test aware location
ViktorHofer Sep 9, 2020
907254e
Disable EOL compat check for packaging testing
ViktorHofer Sep 9, 2020
b86b2f0
Revert "Remove unnecessary CoreLib project build in src.proj"
ViktorHofer Sep 9, 2020
1f77b3a
Update tfm in fsproj
ViktorHofer Sep 9, 2020
322b8f7
EOL packaging
ViktorHofer Sep 9, 2020
1fce71e
Set TargetPlatformMinVersion for netcore5.0
ViktorHofer Sep 9, 2020
5b289ba
Fix tfm for netcore50
ViktorHofer Sep 9, 2020
7b2b88e
Add portable infered props
ViktorHofer Sep 9, 2020
730925b
Add two more portable props
ViktorHofer Sep 9, 2020
a9a4292
Fix frameworksettings and packagesettings lookup
ViktorHofer Sep 9, 2020
27079df
Fix package settings for Utf8String
ViktorHofer Sep 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions eng/Configurations.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -13,4 +15,4 @@
<ItemGroup>
<ProjectReference Include="..\..\src\System.Formats.Cbor.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/pkg/test/project.csproj.template
Original file line number Diff line number Diff line change
Expand Up @@ -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>
safern marked this conversation as resolved.
Show resolved Hide resolved

<SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support</SupportFilesDir>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down