Skip to content

Fix restore internal tools condition #14979

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

Merged
ViktorHofer merged 2 commits into from
Jul 25, 2024
Merged

Fix restore internal tools condition #14979

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
4e55be7
Fix restore internal tools condition
ViktorHofer Jul 25, 2024
7eaaee5
Update VisualStudio.InsertionManifests.targets
ViktorHofer Jul 25, 2024
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 src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!-- Internal tool restore settings -->
<!-- VisualStudio.InsertionManifests.targets: Keep condition in sync with import in AfterSigning.proj. -->
<RestoreInternalTooling Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core' and '$(OfficialBuild)' == 'true'">true</RestoreInternalTooling>
<RestoreInternalTooling Condition="'$(UsingToolVSSDK)' == 'true' and '$(GenerateSbom)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'">true</RestoreInternalTooling>
<RestoreInternalToolingAfterTargets Condition="'$(RestoreInternalTooling)' == 'true'">Restore</RestoreInternalToolingAfterTargets>
</PropertyGroup>

Expand Down
15 changes: 2 additions & 13 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,15 @@
<Error Condition="'$(VisualStudioDropName)' == '' and '$(OfficialBuild)' == 'true'"
Text="Property VisualStudioDropName must be specified in official build that produces Visual Studio insertion components." />

<PropertyGroup>
<_SwixRestoredPackagePath>$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.plugins.swixbuild\$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)\</_SwixRestoredPackagePath>
<_ManifestToolRestoredPackagePath>$(NuGetPackageRoot)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll</_ManifestToolRestoredPackagePath>
</PropertyGroup>

<Error Text="Internal tool not found: 'microsoft.visualstudioeng.microbuild.plugins.swixbuild'. Run restore on '$(RepositoryEngineeringDir)common\internal\Tools.csproj'."
Condition="!Exists('$(_SwixRestoredPackagePath)')" />

<Error Text="Internal tool not found: 'microsoft.manifesttool.crossplatform'. Run restore on '$(RepositoryEngineeringDir)common\internal\Tools.csproj'."
Condition="!Exists('$(_ManifestToolRestoredPackagePath)')" />

<ItemGroup>
<_Args Include="OfficialBuild=$(OfficialBuild)" />
<_Args Include="ComponentName=$(_ComponentName)"/>
<_Args Include="SetupOutputPath=$(VisualStudioSetupInsertionPath)"/>
<_Args Include="ComponentIntermediateOutputPath=$(VisualStudioSetupIntermediateOutputPath)$(_ComponentName)\"/>
<_Args Include="SwixBuildPath=$(_SwixRestoredPackagePath)" />
<_Args Include="SwixBuildPath=$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.plugins.swixbuild\$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)\" />
<_Args Include="VisualStudioDropName=$(VisualStudioDropName)" />
<_Args Include="DotNetTool=$(DotNetTool)" />
<_Args Include="ManifestTool=$(_ManifestToolRestoredPackagePath) "/>
<_Args Include="ManifestTool=$(NuGetPackageRoot)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll" />
<_Args Include="GenerateSbom=$(GenerateSbom)" />
</ItemGroup>

Expand Down
7 changes: 5 additions & 2 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
</PropertyGroup>

<Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.props" />
<Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.props" Condition="'$(SwixBuildPath)' != ''" />

<PropertyGroup>
<FinalizeManifest>true</FinalizeManifest>
Expand All @@ -44,7 +44,7 @@
<_PackageStubFiles Include="$(ComponentIntermediateOutputPath)*.stub"/>
</ItemGroup>

<Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" />
<Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" Condition="'$(SwixBuildPath)' != ''" />

<Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileInfo;_GenerateSbomForVsixAndAddManifestItem;_GenerateVSManifest;GenerateSetupManifest" />

Expand Down Expand Up @@ -100,6 +100,9 @@
Condition="'$(GenerateSbom)' != 'false'">
<Message Text="Generating SBOM manifest for '%(_VsixFileInfo.Identity)'" Importance="high"/>

<Error Text="Internal tool not found: 'microsoft.manifesttool.crossplatform'. Run restore on '$(RepositoryEngineeringDir)common\internal\Tools.csproj'."
Condition="!Exists('$(ManifestTool)')" />

<MakeDir Directories="%(_VsixFileInfo.SbomDir);%(_VsixFileInfo.UnpackDir)"/>
<Copy SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' == '.exe'" />
<Unzip SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' != '.exe'"/>
Expand Down