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

Move to latest NuGet.exe #23786

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Move to latest NuGet.exe #23786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d89eedb
Move to latest NuGet.exe
dougbu Jul 8, 2020
0c767f4
Also switch from NuGet.Build.Tasks to NuGet.Packaging
dougbu Jul 9, 2020
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
2 changes: 1 addition & 1 deletion eng/tools/RepoTasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NuGet.Build.Tasks" Version="5.3.0" />
<PackageReference Include="NuGet.Packaging" Version="5.6.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ if (-not (Test-Path $NuGetDir)) {
}

if (-not (Test-Path $NuGetExe)) {
# Using 5.3.0 to workaround https://github.com/NuGet/Home/issues/5016
Copy link
Member Author

Choose a reason for hiding this comment

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

@rrelyea this bug doesn't appear relevant anymore, especially because we aren't using the more-performant 3.5.0 version. If that's correct, I'm wondering if is dotnet pack able to handle https://github.com/dotnet/aspnetcore/blob/master/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec and https://github.com/dotnet/aspnetcore/blob/master/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec as well as the properties we pass in below yet ❔ I don't see *.nuspecsupport in the help dotnet pack -? spits out but hope it's just undocumented 😄 or will be coming soon.

Copy link
Member Author

Choose a reason for hiding this comment

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

Chatted offline w/ @rrelyea and it's likely we could create the two installer packages using a new *.csproj that runs after our *.wixproj.

Will file a separate issue about this work. It's a larger change and not something I'm going to tackle now. But, it would remove our need for NuGet.exe anywhere in this repo (outside a couple of Arcade post-build stages).

Write-Output "Downloading nuget.exe to $NuGetExe"
wget https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe -OutFile $NuGetExe
wget https://dist.nuget.org/win-x86-commandline/v5.6.0/nuget.exe -OutFile $NuGetExe
}

& $NuGetExe pack $NuspecFile `
Expand Down