-
Notifications
You must be signed in to change notification settings - Fork 336
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
Small fixes for recent work in VSIX up-to-date checks and path detection #14868
base: main
Are you sure you want to change the base?
Conversation
In other cases, the VSIX container properties are not defined, leading to failures in early design time build scenarios.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📝 This is the same condition used above for conditional import of VisualStudio.ImportSdk.targets
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📝 This makes me a bit uncomfortable; let me know if it's acceptable or if there is a better way to do it.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$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.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📝 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 |
VSToolsPath
is definedglobalPackagesFolder
ends with a directory separator