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

Fix nuget and ref assemblies #8252

Merged
merged 6 commits into from Jan 22, 2020
Merged

Fix nuget and ref assemblies #8252

merged 6 commits into from Jan 22, 2020

Conversation

@KevinRansom
Copy link
Member

KevinRansom commented Jan 17, 2020

  1. The #r "nuget" has an issue, when the referenced assembly is a ref assembly.
  2. The #r "nuget" package root code was unable to discover package roots for dependent assemblies

This PR contains some black belt Msbuild Fu that fixes both. As well as a test case.

@KevinRansom KevinRansom requested a review from brettfo Jan 17, 2020
KevinRansom added 2 commits Jan 18, 2020
@TIHan
TIHan approved these changes Jan 20, 2020
Copy link
Contributor

cartermp left a comment

I can't say I understand the MSBuild target that's written in there, but I understand the test and it is a good one.

KevinRansom added 2 commits Jan 21, 2020
@@ -230,6 +230,10 @@ namespace lib"
<PropertyGroup>
<TargetFramework>$(TARGETFRAMEWORK)</TargetFramework>
<IsPackable>false</IsPackable>
<!-- Temporary fix some sdks, shipped internally with broken parameterization -->
<FSharpCoreImplicitPackageVersion Condition=""'$(FSharpCoreImplicitPackageVersion)' == '{{FSharpCoreShippedPackageVersion}}'"">4.7.0</FSharpCoreImplicitPackageVersion>

This comment has been minimized.

Copy link
@brettfo

brettfo Jan 21, 2020

Member

This isn't going to do what you think. At this point you're inside a string in a .fs file; you need to have already computed the variable expansion {{FSharpCoreShippedPackageVersion}}.

@KevinRansom KevinRansom merged commit d2158a1 into dotnet:master Jan 22, 2020
14 checks passed
14 checks passed
WIP Ready for review
Details
fsharp-ci Build #20200121.21 succeeded
Details
fsharp-ci (Build Linux) Build Linux succeeded
Details
fsharp-ci (Build Linux_FCS) Build Linux_FCS succeeded
Details
fsharp-ci (Build MacOS) Build MacOS succeeded
Details
fsharp-ci (Build SourceBuild_Linux) Build SourceBuild_Linux succeeded
Details
fsharp-ci (Build SourceBuild_Windows) Build SourceBuild_Windows succeeded
Details
fsharp-ci (Build UpToDate_Windows) Build UpToDate_Windows succeeded
Details
fsharp-ci (Build Windows coreclr_release) Build Windows coreclr_release succeeded
Details
fsharp-ci (Build Windows desktop_release) Build Windows desktop_release succeeded
Details
fsharp-ci (Build Windows fsharpqa_release) Build Windows fsharpqa_release succeeded
Details
fsharp-ci (Build Windows vs_release) Build Windows vs_release succeeded
Details
fsharp-ci (Build Windows_FCS) Build Windows_FCS succeeded
Details
license/cla All CLA requirements met.
Details
@KevinRansom KevinRansom deleted the KevinRansom:fixnugetrefs branch Jan 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.