Skip to content
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

downgrade to tooling 1.0 #2380

Merged
merged 6 commits into from
Jun 1, 2017
Merged

Conversation

0x53A
Copy link
Contributor

@0x53A 0x53A commented May 29, 2017

@0x53A
Copy link
Contributor Author

0x53A commented May 29, 2017

I didn't run any tests locally, let's see what the CI says.

@0x53A
Copy link
Contributor Author

0x53A commented May 30, 2017

@forki What's up with the build? :D

@matthid
Copy link
Member

matthid commented May 30, 2017

Can you pick the MSBuild fixes from #2362?
Sorry #2362 is not ready to merge jet, and I need a couple of days to fix ... I will take care of it if you can't

@0x53A
Copy link
Contributor Author

0x53A commented May 30, 2017

I would prefer to just add the nuget FSharp.Compiler.Tools instead of hardcoding a few different paths. What do you think?

@matthid
Copy link
Member

matthid commented May 30, 2017

Yes if it works I'm fine with that. nice!

@0x53A
Copy link
Contributor Author

0x53A commented May 30, 2017

Build now works, but one unit test failed. On it!

The great thing about the nuget is that this will allow compatibility with VS 2015 and F# vLatest. For example, if you use struct tuples, you will get red squiggles in the ide, but can still build and run / debug.

@matthid
Copy link
Member

matthid commented May 30, 2017

Yes very nice! btw you can test with the appveyor artefact how this change will impact your scenario (sorry i'm on mobile today and tomorrow...) or just build locally obviously

@0x53A
Copy link
Contributor Author

0x53A commented May 30, 2017

wp_ss_20170531_0001
Av is green, travis failed with a weird error.

Please review if the unit test changes are actually correct.

Copy link
Member

@matthid matthid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep everything looks fine, just some minor stuff. You can ignore the travis failure. I'm on that in my other PR

| DotNetFramework FrameworkVersion.V5_0 -> [ DotNetFramework FrameworkVersion.V4_6_2; DotNetStandard DotNetStandardVersion.V1_5 ]
| DotNetFramework FrameworkVersion.V4_6_3 -> [ DotNetFramework FrameworkVersion.V4_6_2 ]
| DotNetFramework FrameworkVersion.V4_7 -> [ DotNetFramework FrameworkVersion.V4_6_3]
| DotNetFramework FrameworkVersion.V5_0 -> [ DotNetFramework FrameworkVersion.V4_6_2 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'5.0' -> '4.7'

@@ -154,7 154,7 @@ let ``should understand reference folder``() =
model.GetRuntimeAssemblies RuntimeGraph.Empty (Rid.Of "unix") (SinglePlatform (DotNetFramework FrameworkVersion.V4_6_3))
|> Seq.map (fun f -> f.Library.Path)
refs |> shouldNotContain @"..\System.Security.Cryptography.Algorithms\runtimes\win\lib\net46\System.Security.Cryptography.Algorithms.dll"
refs |> shouldContain @"..\System.Security.Cryptography.Algorithms\lib\netstandard1.6\System.Security.Cryptography.Algorithms.dll"
refs |> shouldNotContain @"..\System.Security.Cryptography.Algorithms\lib\netstandard1.6\System.Security.Cryptography.Algorithms.dll"
refs |> shouldNotContain @"..\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a similar test that checks if the rid stuff works, but now with a lower netstandard?
Because now all those changed to shouldnotcontain here so the test no longer tests that...

@matthid
Copy link
Member

matthid commented Jun 1, 2017

Looks good. Travis failure is not related to this PR.
Merging because this fixes the build with MSBuild 15 in a particular nice way.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants