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.

Sign up for GitHub

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

Stop publishing of additional packages in fsharp #19404

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Stop publishing of additional packages in fsharp #19404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f0c0c9
Stop publishing of additional packages in fsharp
NikolaMilosavljevic Apr 10, 2024
3a47d7f
Merge branch 'main' into fsharp.fix
NikolaMilosavljevic Apr 10, 2024
9744c07
Update comment with examples
NikolaMilosavljevic Apr 10, 2024
dd42526
Merge branch 'main' into fsharp.fix
NikolaMilosavljevic Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,12 @@
<Copy SourceFiles="@(PackageVersionPropsSnapshotFiles)" DestinationFolder="$(PackageReportDir)snapshots/" />

<ItemGroup>
<RestoredPackageFile Include="$(NuGetPackageRoot)**/*.nupkg"
<!--
Note the usage of */*/*.nupkg and not **/*.nupkg. The latter would include nupkgs
carried as content, i.e. in Microsoft.FSharp.Compiler nupkg, and cause false positives.
Content nupkgs were not restored and should not be used in prebuit detection.
-->
<RestoredPackageFile Include="$(NuGetPackageRoot)*/*/*.nupkg"
Copy link
Member

Choose a reason for hiding this comment

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

Please add an example of a path in the above description to better understand the glob.

Copy link
Member

Choose a reason for hiding this comment

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

I.e. something like <packageid>/<packageversion>/...

Copy link
Member Author

Choose a reason for hiding this comment

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

Will update - thanks!

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed with 9744c07

Copy link
Member

@ViktorHofer ViktorHofer Apr 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

What if a nuget package includes another nuget packages in the package root? Would that then still be included by this glob? Can we make the glob more specific?

I guess it's hard to get this right. Given that there shouldn't be any packages that are doing this, maybe it's OK?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I'm not sure if that would be easy, but I agree that this solution isn't perfect. We've only ever seen this single FSharp package carrying other nupkgs as content.

Exclude="$(NuGetPackageRoot)tests/**/*.nupkg" />

<!-- Only contains packages when building. -->
Expand Down
30 changes: 30 additions & 0 deletions src/SourceBuild/patches/fsharp/0001-Stop-publishing-of-additional-packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <[email protected]>
Date: Wed, 10 Apr 2024 15:26:09 +0000
Subject: [PATCH] Stop publishing of additional packages

Backport: https://github.com/dotnet/fsharp/pull/17016
---
eng/Publishing.props | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 eng/Publishing.props

diff --git a/eng/Publishing.props b/eng/Publishing.props
deleted file mode 100644
index 6a0673b5a..000000000
--- a/eng/Publishing.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-
- <ItemGroup>
- <!--
- Additional packages needed to avoid prebuilts in VMR - https://github.com/dotnet/source-build/issues/4203
- -->
- <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)Dependency\**\*.nupkg"
- IsShipping="true"
- UploadPathSegment="Runtime"
- Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
- </ItemGroup>
-
-</Project>
Loading