diff --git a/packages.config b/packages.config index 6195af6c9e1f174cb089dc80993d020329799648..43bff474ebf7de6fdf113a3d80f1846dab7b99a7 100644 --- a/packages.config +++ b/packages.config @@ -42,7 +42,7 @@ - + diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs index 633cb063bb835ab52d9722c1ad55431a703a170c..d1efbb46935f1472edead75e979b22af3ac28821 100644 --- a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs +++ b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs @@ -52,22 +52,22 @@ - + - + - + - + diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 343619149b7aa31551faa90b40f17032074ca429..671a2320e705b0bde996600496081cca5f62961e 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -31,7 +31,7 @@ true false - + 2.0.0 15.0 15.0.26201 @@ -44,8 +44,10 @@ obj\$(Configuration)\$(TargetDotnetProfile)\ obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\ - 4.1.18 - 4.2.1 + 4.1.18 + 4.1.20 + 4.1.21 + 4.2.2 diff --git a/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj b/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj index e2e2ceab809663c18c451deff3c70af2c63c4d6b..6373fc3fb3e939d9a68de67a4bacbee3728b1df2 100644 --- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj +++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj @@ -18,6 +18,7 @@ + @@ -36,10 +37,10 @@ - + - + X.X.XXX - $(FSharpCore41Version) + + $(FSharpCore41TargetVersion) 4.1 - $(FSharpCore42Version) + + $(FSharpCore42TargetVersion) 4.2 + + $(FSharpCore41FrozenPortableTargetVersion) + 4.1 + -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" diff --git a/src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec b/src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec new file mode 100644 index 0000000000000000000000000000000000000000..128b62cb3fdcef4be013128cd7ecd713ec65133a --- /dev/null +++ b/src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec @@ -0,0 +1,27 @@ + + + + + Microsoft.Portable.FSharp.Core + Frozen portable profiles + en-US + false + $version$ + $authors$ + $licenseUrl$ + $projectUrl$ + $tags$ + + + + + + + + + + + + + + diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 6fd7e1ba0901ab268e2928b56d844e74eb2ebb1b..15dcfc5ab4c2a57fc0205ff68fbc58981015e252 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -276,7 +276,7 @@ Outputs='$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'> - -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42Version)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" + -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42TargetVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"