-
Notifications
You must be signed in to change notification settings - Fork 341
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?
Changes from 3 commits
06a048f
12b698c
75fcbf6
2455fde
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -659,6 +659,11 @@ function GetNuGetPackageCachePath() { | |||||
# global packages folder, this expression will evaluate to the empty string which will effectively leave the | ||||||
# environment variable set to null. | ||||||
$env:NUGET_PACKAGES = $nugetConfigXml.SelectSingleNode("//configuration/config/add[@key='globalPackagesFolder']").value | ||||||
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 commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
This appears to do the correct thing locally. |
||||||
} | ||||||
} | ||||||
|
||||||
if ($env:NUGET_PACKAGES -eq $null) { | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,28 +134,35 @@ | |
</ItemGroup> | ||
|
||
<ItemGroup Condition="'$(Restore)' == 'true'"> | ||
<_RestoreToolsProps Include="@(_CommonProps)"/> | ||
<_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/> | ||
<_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/> | ||
<_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/> | ||
|
||
<_RestoreProps Include="@(_CommonProps)"/> | ||
<_RestoreProps Include="ExcludeRestorePackageImports=true"/> | ||
<_RestoreProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/> | ||
|
||
<!-- Used in the SDK (Tools.proj) to control whether Build.Tasks.Feed will be restored or not. --> | ||
<_RestoreToolsProps Include="Publish=$(Publish)"/> | ||
<_RestoreProps Include="Publish=$(Publish)"/> | ||
|
||
<!-- Used in the SDK (Tools.proj) to control whether SymbolUploader.Build.Task will be restored or not. --> | ||
<_RestoreToolsProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/> | ||
<_RestoreProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/> | ||
|
||
<!-- Forward this property because we can't assume it will be available globally. --> | ||
<_RestoreToolsProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/> | ||
<_RestoreProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/> | ||
</ItemGroup> | ||
|
||
<!-- | ||
Builds from the 'internal' project, and only those, can download the .net Runtime | ||
from a private location. | ||
--> | ||
<ItemGroup Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'"> | ||
<_RestoreToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/> | ||
<_RestoreToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/> | ||
<_RestoreProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/> | ||
<_RestoreProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/> | ||
</ItemGroup> | ||
|
||
<ItemGroup Condition="'$(Restore)' == 'true'"> | ||
<_RestoreToolsProps Include="@(_RestoreProps)"/> | ||
<_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/> | ||
|
||
<_RestoreSignProps Include="@(_RestoreProps)"/> | ||
<_RestoreSignProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)CommonSign"/> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
|
@@ -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 commentThe reason will be displayed to describe this comment to others. Learn more. 📝 Restoring Sign.proj is the step that defines |
||
--> | ||
<MSBuild Projects="Sign.proj" | ||
Targets="Restore" | ||
Properties="@(_RestoreSignProps);_NETCORE_ENGINEERING_TELEMETRY=Restore" | ||
Condition="'$(Restore)' == 'true'"/> | ||
|
||
<!-- | ||
Restore solutions and projects. | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 commentThe 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 |
||
<CollectUpToDateCheckInputDesignTimeDependsOn>$(CollectUpToDateCheckInputDesignTimeDependsOn);CollectVsixUpToDateCheckInput</CollectUpToDateCheckInputDesignTimeDependsOn> | ||
<CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);CollectVsixUpToDateCheckBuilt</CollectUpToDateCheckBuiltDesignTimeDependsOn> | ||
</PropertyGroup> | ||
|
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.