update build

dsyme · dsyme · commit f0520757841e · 2021-09-20T22:52:10.000+01:00
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,4 +1,4 @@
-name: Build and Test
+name: Build and Test PR
 
 on:
   pull_request:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: Build and Test
+name: Build and Test and Publish
 
 on:
   push:
@@ -41,15 +41,7 @@ jobs:
         publish_branch: gh-pages
         force_orphan: true
 
-    - name: Examine outputs
+    - name: Publish NuGets (if versions not published before)
       if: matrix.os != 'windows-latest'
-      run: ls -r .
-
-    - name: Publish SDK NuGet (if this version not published before)
-      if: matrix.os != 'windows-latest'
-      run: dotnet nuget push src\bin\Release\*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN }} --skip-duplicate
-
-    - name: Publish template NuGet (if this version not published before)
-      if: matrix.os != 'windows-latest'
-      run: dotnet nuget push templates\bin\Release\*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN }} --skip-duplicate
+      run: dotnet nuget push bin\FSharp.TypeProviders.*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN }} --skip-duplicate
 
diff --git a/examples/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj b/examples/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <DefineConstants>IS_DESIGNTIME</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
diff --git a/examples/BasicProvider.Runtime/BasicProvider.Runtime.fsproj b/examples/BasicProvider.Runtime/BasicProvider.Runtime.fsproj
@@ -2,7 +2,7 @@
   
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
     <PackagePath>typeproviders</PackagePath>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
diff --git a/examples/StressProvider/StressProvider.fsproj b/examples/StressProvider/StressProvider.fsproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
diff --git a/src/FSharp.TypeProviders.SDK.fsproj b/src/FSharp.TypeProviders.SDK.fsproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <PackageIcon>logo.png</PackageIcon>
diff --git a/src/ProvidedTypes.fs b/src/ProvidedTypes.fs
@@ -758,7 +758,7 @@ type ProvidedTypeSymbol(kind: ProvidedTypeSymbolKind, typeArgs: Type list, typeB
 
     override this.MakeArrayType arg = ProvidedTypeSymbol(ProvidedTypeSymbolKind.Array arg, [this], typeBuilder) :> Type
 
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
     // See bug https://github.com/fsprojects/FSharp.TypeProviders.SDK/issues/236
     override __.IsSZArray = 
         match kind with
@@ -1698,7 +1698,7 @@ and ProvidedTypeDefinition(isTgt: bool, container:TypeContainer, className: stri
 
     override __.MemberType = if this.IsNested then MemberTypes.NestedType else MemberTypes.TypeInfo
 
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDANETSTANDARD2_1_OR_GREATERRD2_1
     // See bug https://github.com/fsprojects/FSharp.TypeProviders.SDK/issues/236
     override __.IsSZArray = false
 #endif
@@ -7524,7 +7524,7 @@ namespace ProviderImplementation.ProvidedTypes
             | TypeSymbolKind.OtherGeneric gtd -> gtd.MemberType
             | _ -> notRequired this "MemberType" this.FullName
             
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
         // See bug https://github.com/fsprojects/FSharp.TypeProviders.SDK/issues/236
         override __.IsSZArray =
             match kind with
@@ -8079,7 +8079,7 @@ namespace ProviderImplementation.ProvidedTypes
         member __.MakeFieldInfo (declTy: Type) md = txILFieldDef declTy md
         member __.MakeNestedTypeInfo (declTy: Type) md =  asm.TxILTypeDef (Some declTy) md
         override this.GetEvents() = this.GetEvents(BindingFlags.Public ||| BindingFlags.Instance ||| BindingFlags.Static) // Needed because TypeDelegator.cs provides a delegting implementation of this, and we are self-delegating
-#if NETCOREAPP
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
         // See bug https://github.com/fsprojects/FSharp.TypeProviders.SDK/issues/236
         override __.IsSZArray = false
 #endif
diff --git a/templates/FSharp.TypeProviders.Templates.proj b/templates/FSharp.TypeProviders.Templates.proj
@@ -7,7 +7,7 @@
     <PackageType>Template</PackageType>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <ExcludeFromPackage>
diff --git a/templates/content/basic/src/MyProvider.DesignTime/MyProvider.DesignTime.fsproj b/templates/content/basic/src/MyProvider.DesignTime/MyProvider.DesignTime.fsproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <DefineConstants>IS_DESIGNTIME</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
diff --git a/templates/content/basic/src/MyProvider.Runtime/MyProvider.Runtime.fsproj b/templates/content/basic/src/MyProvider.Runtime/MyProvider.Runtime.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
     <PackagePath>typeproviders</PackagePath>
diff --git a/tests/BasicErasedProvisionTests.fs b/tests/BasicErasedProvisionTests.fs
@@ -35,14 +35,6 @@ type ErasingProvider (config : TypeProviderConfig, hasBigInt: bool) as this =
         myType.AddMembers [myStaticGetterProp; myStaticGetterProp2; myStaticSetterProp; myGetterProp; mySetterProp]
         myType.AddMembers [myStaticMethod; myMethod ]
 
-        // See bug https://github.com/fsprojects/FSharp.TypeProviders.SDK/issues/236
-#if NETCOREAPP
-        let genTy = typedefof<list<_>>
-        // The next line loops on netcoreapp3.1 when the ProvidedTypes.fs is compiled as netstandard2.0 (without NETCOREAPP defined)
-        let instTy = genTy.MakeGenericType(myType)
-        let fails = instTy.FullName
-#endif
-
         [myType]
 
     do

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Build and Test`
	`1`	`+name: Build and Test PR`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`pull_request:`