Skip to content

Update test-projects to net8.0 #416

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<DefineConstants>IS_DESIGNTIME</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion examples/BasicProvider.Runtime/BasicProvider.Runtime.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
<PackagePath>typeproviders</PackagePath>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/BasicProvider.Tests/BasicProvider.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/StressProvider.Tests/StressProvider.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion examples/StressProvider/StressProvider.fsproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\src\ProvidedTypes.fsi" />
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.TypeProviders.SDK.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<DebugType>portable</DebugType>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
7 changes: 7 additions & 0 deletions src/ProvidedTypes.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace ProviderImplementation.ProvidedTypes

#nowarn "1182"
#nowarn "3370"
#nowarn "0044" // This construct is deprecated. Formatter-based serialization is obsolete and should not be used.

// This file contains a set of helper types and methods for providing types in an implementation
// of ITypeProvider.
Expand Down Expand Up @@ -2926,6 +2927,9 @@ module internal AssemblyReader =
member x.IsStatic = x.Attributes &&& FieldAttributes.Static <> enum 0
member x.IsInitOnly = x.Attributes &&& FieldAttributes.InitOnly <> enum 0
member x.IsLiteral = x.Attributes &&& FieldAttributes.Literal <> enum 0
#if NETSTANDARD2_1_OR_GREATER
[<Obsolete(DiagnosticId = "SYSLIB0051")>]
#endif
member x.NotSerialized = x.Attributes &&& FieldAttributes.NotSerialized <> enum 0
member x.IsSpecialName = x.Attributes &&& FieldAttributes.SpecialName <> enum 0
//let isStatic = (flags &&& 0x0010) <> 0
Expand Down Expand Up @@ -3030,6 +3034,9 @@ module internal AssemblyReader =
member x.IsDelegate = (match x.Kind with ILTypeDefKind.Delegate -> true | _ -> false)
member x.IsAbstract= (x.Attributes &&& TypeAttributes.Abstract) <> enum 0
member x.IsSealed= (x.Attributes &&& TypeAttributes.Sealed) <> enum 0
#if NETSTANDARD2_1_OR_GREATER
[<Obsolete(DiagnosticId = "SYSLIB0051")>]
#endif
member x.IsSerializable= (x.Attributes &&& TypeAttributes.Serializable) <> enum 0
member x.IsComInterop= (x.Attributes &&& TypeAttributes.Import) <> enum 0
member x.IsSpecialName= (x.Attributes &&& TypeAttributes.SpecialName) <> enum 0
Expand Down
23 changes: 12 additions & 11 deletions templates/content/basic/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "6.1.3",
"commands": [
"paket"
]
}
}
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"commands": [
"paket"
],
"rollForward": false
}
}
}
2 changes: 1 addition & 1 deletion templates/content/basic/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.400",
"version": "8.0.400",
"rollForward": "minor"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<DefineConstants>IS_DESIGNTIME</DefineConstants>
<!-- This allows the component to execute from 'bin' directory during build -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
<PackagePath>typeproviders</PackagePath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.TypeProviders.SDK.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>5.0</LangVersion>
</PropertyGroup>
Expand Down
Loading