Small fixes for recent work in VSIX up-to-date checks and path detection #14868
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In other cases, the VSIX container properties are not defined, leading to failures in early design time build scenarios.
sharwell
commented
Jun 19, 2024
| @@ -284,7 +284,7 @@ | |||
| <!-- | |||
| Make sure to include information about inputs and outputs to CreateVsixContainer for fast up-to-date check. | |||
| --> | |||
| <PropertyGroup> | |||
| <PropertyGroup Condition="'$(VSToolsPath)' != '' and ('$(IsVsixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true')"> | |||
There was a problem hiding this comment.
📝 This is the same condition used above for conditional import of VisualStudio.ImportSdk.targets
sharwell
commented
Jun 19, 2024
| if ($env:NUGET_PACKAGES -ne $null) { | ||
| # Join-Path with an empty child path effectively adds a trailing directory separator only if one does not | ||
| # already exist | ||
| $env:NUGET_PACKAGES = Join-Path $env:NUGET_PACKAGES '' |
There was a problem hiding this comment.
📝 This makes me a bit uncomfortable; let me know if it's acceptable or if there is a better way to do it.
mmitche
reviewed
Jun 19, 2024
| if ($env:NUGET_PACKAGES -ne $null) { | ||
| # Join-Path with an empty child path effectively adds a trailing directory separator only if one does not | ||
| # already exist | ||
| $env:NUGET_PACKAGES = Join-Path $env:NUGET_PACKAGES '' |
There was a problem hiding this comment.
Suggested change
| $env:NUGET_PACKAGES = Join-Path $env:NUGET_PACKAGES '' | |
| $env:NUGET_PACKAGES = Join-Path $env:NUGET_PACKAGES $([IO.Path]::DirectorySeparatorChar) |
This appears to do the correct thing locally.
sharwell
commented
Jun 19, 2024
| @@ -185,6 +192,14 @@ | |||
| Properties="@(_RestoreToolsProps);_NETCORE_ENGINEERING_TELEMETRY=Restore" | |||
| Condition="'$(Restore)' == 'true'"/> | |||
|
|
|||
| <!-- | |||
| Restore built-in tools for signing. | |||
There was a problem hiding this comment.
📝 Restoring Sign.proj is the step that defines NuGetPackageRoot for use within it.
|
@sharwell a quick note - we squash merge in Arcade instead of merging only |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
VSToolsPathis definedglobalPackagesFolderends with a directory separator