Migration to .NET Standard 2.0 #360

ChrSteinert · 2018-02-18T19:16:42Z

This upgrades the project to .NET Core 2.0.
Also, necessary type anotations for new core 2.0 APIs had been made.

Upgrades to .NET Core 2.0. Makes necessary type anotations for new core 2.0 APIs.

panesofglass · 2018-03-01T06:24:27Z

@ChrSteinert SourceLink changed a lot, so you can remove what's in there now. @ctaggart can probably help with the new version of SourceLink.

ChrSteinert · 2018-03-01T06:33:24Z

Cool, thanks for the update. Will move on without it then (this should make things easier for now ;) )

ChrSteinert · 2018-03-01T08:37:31Z

Ok - I guess I am happy with this for now. Would love to get some feedback on this!

panesofglass

This looks pretty good! Thank you for your efforts so far. I made a few comments about the build script based on feedback I received from @enricosada. You can see an example of what I mean here.

panesofglass · 2018-03-02T03:28:41Z

.travis.yml

@@ -1,5 +1,6 @@
 language: csharp
-
+mono: latest
+dotnet: 2.1.4


Does this require 2.1.4? If not, shouldn't we keep it as low as possible or use a matrix to test multiple versions?

Agreed, I'd guess 2.0.3 is the lowest possible.

panesofglass · 2018-03-02T03:29:12Z

build.fsx

@@ -119,21 +114,16 @@ Target "CopyBinaries" (fun _ ->
 // Clean build results

 Target "Clean" (fun _ ->
-    !! solutionFile |> MSBuildRelease "" "Clean" |> ignore
+    // !! solutionFile |> MSBuildRelease "" "Clean" |> ignore


Call dotnet clean? Is that a thing?

It is a thing! :)

panesofglass · 2018-03-02T03:29:43Z

build.fsx

-#endif
-    |> ignore
+    !! solutionFile |> MSBuildRelease "" "Restore" |> ignore
+    !! solutionFile |> MSBuildRelease "" "Build" |> ignore


We should probably use the DotNetCli module here to run the restore and build, which should be one task with that module.

I was reverting back to MSBuild for travis to be happy. See this CI run: https://travis-ci.org/fsprojects/FSharpx.Extras/builds/345267943?utm_source=github_status&utm_medium=notification

I would assume this can only be "fixed" with only compiling to netstandard.
Any opinions on dropping net45?

panesofglass · 2018-03-02T03:30:57Z

build.fsx

-)
-
-#endif
-
 // --------------------------------------------------------------------------------------
 // Build a NuGet package

 Target "NuGet" (fun _ ->
    Paket.Pack(fun p ->


Prefer the DotNetCli module to Paket.

panesofglass · 2018-03-02T03:32:07Z

src/FSharpx.Extras/FSharpx.Extras.fsproj

-    <DocumentationFile>bin\Debug\FSharpx.Extras.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFramework>net45</TargetFramework>


Shouldn't we add netstandard2.0?

Wow - the main part slipped me …

panesofglass · 2018-03-02T03:33:02Z

src/FSharpx.Text.StructuredFormat/FSharpx.Text.StructuredFormat.fsproj

-    <AssemblyName>FSharpx.Text.StructuredFormat</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <TargetFramework>net45</TargetFramework>


Add netstandard2.0?

panesofglass · 2018-03-02T03:33:27Z

tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj

-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFramework>net45</TargetFramework>


Test with netcore2.0?

panesofglass · 2018-03-02T03:33:55Z

tests/FSharpx.Tests/FSharpx.Tests.fsproj

    <OutputType>Library</OutputType>
    <RootNamespace>FSharpx.Tests</RootNamespace>
    <AssemblyName>FSharpx.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <TargetFramework>net45</TargetFramework>


Test with netcore2.0?

Adds System.Reflection.Emit.Lightweight for Emit.DynamicMethod on .NET Standard 2.0.

ChrSteinert · 2018-03-02T10:25:53Z

I hope having a fresh lock file is an okish thing to have‽

…om/de-de/dotnet/api/system.text.encoding?view=netcore-2.0#Remarks ).

ChrSteinert · 2018-03-02T14:06:43Z

Hmm. Tests succeed, but Pakets reports an error. How unfortunate.

panesofglass · 2018-03-02T21:01:09Z

build.fsx

-            OutputPath = "bin"
-            Version = release.NugetVersion
-            ReleaseNotes = toLines release.Notes})
+            OutputPath = "bin" })


I think this will also rebuild without specifying you want to skip it.

ChrSteinert · 2018-03-03T17:24:23Z

Cool - added the --no-build to save the environment ;)
I am happy with this again ;)

panesofglass · 2018-03-05T16:01:26Z

build.fsx

@@ -140,7 +140,8 @@ Target "RunTests" (fun _ ->
 Target "NuGet" (fun _ ->
    DotNetCli.Pack(fun p ->
        { p with
-            OutputPath = "bin" })
+            OutputPath = "bin"
+            AdditionalArgs = [ "--no-build" ] })


panesofglass · 2018-03-05T16:02:51Z

@forki, @enricosada, or anyone else want to weigh in before we merge?

enricosada

some feedback.

for sourcelink you can do like FSAC ( https://github.com/fsharp/FsAutoComplete/blob/master/src/Directory.Build.props ) or directly add these in paket (should work now afaik, target will be imported correctly for privateassets)

About commands, probably is easyer to call all targets against the solution, instead for earch project.
result is pretty much the same, but is faster. You call on this, no hard feeling. my idea is dotnet build FSharpx.Extras.sln or just dotnet build from root should do (same for dotnet test, dotnet pack, etc).

enricosada · 2018-03-05T16:46:56Z

src/FSharpx.Extras/FSharpx.Extras.fsproj

-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFrameworkVersion) == 'v4.0'">
-    <DefineConstants>NET40</DefineConstants>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>


this is old style 😄

you can replace with

<GenerateDocumentationFile>true</GenerateDocumentationFile>

Uh, have never seen that. That is awesome. Will put it in!

enricosada · 2018-03-05T16:47:44Z

src/FSharpx.Extras/paket.template

@@ -21,5 +21,6 @@ summary
    FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
 description
    FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
-
+files
+    src/FSharpx.Extras/bin/Release/net45/* ==> lib/net45


you really need that? you can generate with dotnet pack. paket support that (will use paket refs)

enricosada · 2018-03-05T16:47:59Z

src/FSharpx.Text.StructuredFormat/FSharpx.Text.StructuredFormat.fsproj

-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFrameworkVersion) == 'v4.5'">
-    <DefineConstants>NET45</DefineConstants>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>


like previous, use <GenerateDocumentationFile>true</GenerateDocumentationFile>

enricosada · 2018-03-05T16:48:18Z

src/FSharpx.Text.StructuredFormat/paket.template

@@ -21,5 +21,6 @@ summary
    FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
 description
    FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
-
+files
+    src/FSharpx.Text.StructuredFormat/bin/Release/net45/* ==> lib/net45


same dotnet pack

ChrSteinert · 2018-03-06T09:20:18Z

dotnet build already targets the SLN file. For test I opted to specify projects specifically because FAKE will think that test failed in projects without tests in it and fail the whole build.

One additional thing I noticed; dotnet pack does not correctly set the version of the package. It is always 1.0.0.0. Any clues?

enricosada · 2018-03-06T16:18:41Z

@ChrSteinert dotnet pack /p:Version=1.2.3 will generate a package with that version (ideally also setting the attributes of assembly like Version and FileVersion, but atm doesnt work for F#, is not implemented).
you can also use /p:PackageVersion=1.2.3 (that will just set package version leaving assembly info as is)

probably you can move all the paket.template attributes in fsproj or a Directory.Build.props. you can see the full list in https://docs.microsoft.com/en-us/dotnet/core/tools/csproj#nuget-metadata-properties , for example the descvription is <Description>my description</Description> or "/p:Description=my description" or setting an env var Description

ChrSteinert · 2018-03-07T06:42:05Z

OK - so move away from Pakets pack to .NET. Will do that.

…encoded in the `.dll`s.

ChrSteinert · 2018-03-07T10:21:37Z

@enricosada How does it look now?

enricosada

👍

toburger · 2018-05-10T14:02:02Z

Any chance to get this published to NuGet?

panesofglass · 2018-05-12T18:47:57Z

@enricosada or @forki, do either of you know how publishing works now? I haven't done much with this set of projects in quite some time.

sergey-tihon · 2018-06-02T10:50:17Z

@panesofglass would you like to become a maintainer of this project? (I can add you to NuGet package owners)

I guess that @forki does not mind

Migrates FSharpx.Extras to SDK style project file.

6822447

Upgrades to .NET Core 2.0. Makes necessary type anotations for new core 2.0 APIs.

ChrSteinert mentioned this pull request Feb 23, 2018

What needs to be done to have a release compatible with .NET Standard 2.0? #359

Closed

ChrSteinert added 3 commits February 23, 2018 15:08

Fixes packaging of NuGet packages and builds tests.

cd91813

Updates Travis to have donet CLI.

51400e0

Reuses MSBuild for building for Travis.

aaf2e1f

ChrSteinert added 3 commits March 1, 2018 07:34

Fixes location of test assemblies.

30007d3

Removes SourceLink.

0ab4af0

Fixes output location of projects.

5c9922c

ChrSteinert changed the title ~~[WIP] Migration to .NET Standard 2.0~~ Migration to .NET Standard 2.0 Mar 1, 2018

panesofglass requested changes Mar 2, 2018

View reviewed changes

Moves projects to .NET Standard/Core.

4e88752

Adds System.Reflection.Emit.Lightweight for Emit.DynamicMethod on .NET Standard 2.0.

ChrSteinert changed the title ~~Migration to .NET Standard 2.0~~ [WIP] Migration to .NET Standard 2.0 Mar 2, 2018

ChrSteinert added 6 commits March 2, 2018 11:14

Updates dependencies (fresh lock file), to use dotnet test.

35963a1

Makes adjustment for the new versions.

ab1ae8e

Removes obsolete binding redirects.

8ea90b1

Uses dotnet test for testing.

aea4d72

Downgrade .NET SDK version for Travis to 2.0.3

89dce73

Adds dotnet clean to the build script.

dc7f9f5

ChrSteinert added 3 commits March 2, 2018 11:42

Updates Text.StructuredFormat to .NET Standard 2.0.

6fe4bd8

Changes to experimental travis config and dotnet build.

63baed0

Removes .NET Core incompatible encoding (see https://docs.microsoft.c…

bc39dac

…om/de-de/dotnet/api/system.text.encoding?view=netcore-2.0#Remarks ).

ChrSteinert added 2 commits March 2, 2018 15:10

Reduces testing to the real test projects to fix reported tests error.

2c361ba

Adds output of pdb files.

6988410

panesofglass approved these changes Mar 2, 2018

View reviewed changes

panesofglass reviewed Mar 2, 2018

View reviewed changes

Adds --no-build to the pack command.

52d1d85

ChrSteinert changed the title ~~[WIP] Migration to .NET Standard 2.0~~ Migration to .NET Standard 2.0 Mar 3, 2018

panesofglass reviewed Mar 5, 2018

View reviewed changes

panesofglass approved these changes Mar 5, 2018

View reviewed changes

enricosada suggested changes Mar 5, 2018

View reviewed changes

Changes to GenerateDocumentationFile in the fsproj files.

8b8b064

ChrSteinert added 3 commits March 6, 2018 11:33

Adds SourceLink.

e726188

Removes explicit file declarations for NuGet package.

2763aee

Fix additional args for build.

0ab35c8

ChrSteinert added 3 commits March 7, 2018 08:02

Moves from Paket.Pack to dotnet pack.

9876e2b

Adds correct package version to the NuGet.

d27d4ed

Adds AssemblyInfo.fs files to the projects to have correct version …

9e560f9

…encoded in the `.dll`s.

enricosada approved these changes Mar 8, 2018

View reviewed changes

panesofglass merged commit 5ac4edd into fsprojects:master Mar 8, 2018

panesofglass mentioned this pull request May 18, 2018

Migration to .NET Core #355

Closed

panesofglass mentioned this pull request Sep 12, 2018

AssemblyVersion missing #363

Closed

Migration to .NET Standard 2.0 #360

Migration to .NET Standard 2.0 #360

Conversation

ChrSteinert commented Feb 18, 2018 • edited Loading

panesofglass commented Mar 1, 2018

ChrSteinert commented Mar 1, 2018

ChrSteinert commented Mar 1, 2018

panesofglass left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChrSteinert commented Mar 2, 2018

ChrSteinert commented Mar 2, 2018

Choose a reason for hiding this comment

ChrSteinert commented Mar 3, 2018

Choose a reason for hiding this comment

panesofglass commented Mar 5, 2018

enricosada left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChrSteinert commented Mar 6, 2018

enricosada commented Mar 6, 2018

ChrSteinert commented Mar 7, 2018

ChrSteinert commented Mar 7, 2018

enricosada left a comment

Choose a reason for hiding this comment

toburger commented May 10, 2018

panesofglass commented May 12, 2018

sergey-tihon commented Jun 2, 2018 • edited Loading

ChrSteinert commented Feb 18, 2018 •

edited

Loading

sergey-tihon commented Jun 2, 2018 •

edited

Loading