Accept netstandard20 in Visual Studion integration -references #3284

fsprojects · Jul 6, 2018 · 658a486 · 658a486
1 parent 5f17139
commit 658a486
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 5.174.1 - 2018-07-06
+* BUGFIX: Accept netstandard20 in Visual Studion integration - https://github.com/fsprojects/Paket/issues/3284
+
 #### 5.174.0 - 2018-07-06
 * NEW FEATURE: Improved Visual Studio integration - https://github.com/fsprojects/Paket/pull/3273
 * BUGFIX: Paket doesn't add Compile tags for packages when new project format ius used - https://github.com/fsprojects/Paket/issues/3269

diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs
@@ -287,9 +287,6 @@ let createPaketPropsFile (lockFile:LockFile) (cliTools:ResolvedPackage seq) (pac
                     |> Seq.collect (fun (p,_) ->
                         [sprintf """        <PackageReference Include="%O">""" p.Name
                          sprintf """            <Version>%O</Version>""" p.Version
-                        //"""            <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>""" +
-                        //"""            <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>""" +
-                        //"""            <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>""" +
                          """        </PackageReference>"""])
 
                 [yield sprintf "    <ItemGroup Condition=\"($(DesignTimeBuild) == true)%s\">" condition

diff --git a/src/Paket.Core/Versioning/Requirements.fs b/src/Paket.Core/Versioning/Requirements.fs
@@ -299,10 +299,13 @@ type FrameworkRestriction =
         x.RawFormular.IsMatch tp
 
     member x.ToMSBuildCondition() =
-            let formulas = 
-                [for fr in x.RepresentedFrameworks -> 
-                    sprintf "('$(TargetFramework)' == '%O')" fr]
-            String.Join(" OR ",formulas)
+        let formulas = 
+            [for fr in x.RepresentedFrameworks do 
+                let fr = fr.ToString()
+                yield sprintf "('$(TargetFramework)' == '%s')" fr
+                if fr.Contains "." then
+                    yield sprintf "('$(TargetFramework)' == '%s')" (fr.Replace(".",""))]
+        String.Join(" OR ",formulas)
 
     override x.Equals(y) =
         match y with