Skip to content

Enable NuGet Client in the VMR build #19520

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

Closed
mmitche wants to merge 1 commit into from
Closed

Enable NuGet Client in the VMR build #19520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions 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 @@ -56,11 +56,6 @@
RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" />
<TransitiveRepositoryReference Include="@(_TransitiveRepositoryReference)" KeepDuplicates="false" />
</ItemGroup>

<!-- Exclude repositories that currently don't build when not building source-only. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<TransitiveRepositoryReference Remove="nuget-client" />
</ItemGroup>
</Target>

<!-- Wraps the transitive repo references with additional metadata -->
Expand Down
8 changes: 7 additions & 1 deletion src/SourceBuild/content/repo-projects/nuget-client.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
<NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>

<!-- Don't pass any build actions because the repo doesn't support them. -->
<BuildActions></BuildActions>
Comment on lines +7 to +8
Copy link
Member

@ViktorHofer ViktorHofer Apr 18, 2024

Choose a reason for hiding this comment

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

This worked before so I wonder what changed?

Copy link
Member Author

@mmitche mmitche Apr 18, 2024

Choose a reason for hiding this comment

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

I only worked before because the .sh script is just set up to swallow anything starting with -

<!-- Call into a custom build script as nuget-client doesn't use Arcade infra. -->
<BuildScript>$([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'source-build', 'build$(ShellExtension)'))</BuildScript>
<BuildScript>$([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'dotnet-build', 'build$(ShellExtension)'))</BuildScript>
<!-- Passed for compatibility with new P4 SDK. -->
<BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
<!-- Avoid passing -dotnetEngine msbuild switch, which nuget doesn't recognize. -->
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
</PropertyGroup>

<ItemGroup>
Expand Down