Skip to content

Commit 35ef0d6

Browse files
committed
Restore tools in Tools.proj via PackageDownload
1 parent 8486610 commit 35ef0d6

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<Import Project="BuildStep.props" />
55

6-
<!-- Properties requires by NuGet.targets to restore PackageReferences -->
6+
<!-- Properties requires by NuGet.targets to restore packages -->
77
<PropertyGroup>
88
<TargetFramework>net472</TargetFramework>
99
<!-- Workaround changes from newer MSBuild requiring additional properties -->
@@ -34,7 +34,7 @@
3434
<Import Project="$(_NuGetRestoreTargets)" />
3535

3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="$(MicrosoftDotnetNuGetRepackTasksVersion)" Condition="'$(UsingToolNuGetRepack)' == 'true'" IsImplicitlyDefined="true" />
37+
<PackageDownload Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="[$(MicrosoftDotnetNuGetRepackTasksVersion)]" Condition="'$(UsingToolNuGetRepack)' == 'true'" />
3838
</ItemGroup>
3939

4040
<PropertyGroup>
@@ -45,23 +45,23 @@
4545

4646
<ItemGroup Condition="'$(_ImportOrUseTooling)' == 'true'">
4747
<!-- Copy of 'sn.exe' in form of NuGet package. -->
48-
<PackageReference Include="sn" Version="$(SNVersion)" IsImplicitlyDefined="true" />
49-
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" IsImplicitlyDefined="true" />
50-
<PackageReference Include="MicroBuild.Core.Sentinel" Version="1.0.0" IsImplicitlyDefined="true" />
51-
<PackageReference Include="vswhere" Version="$(VSWhereVersion)" IsImplicitlyDefined="true" />
52-
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" IsImplicitlyDefined="true" />
53-
<PackageReference Include="Microsoft.WixToolset.Sdk" Version="$(MicrosoftWixToolsetSdkVersion)" IsImplicitlyDefined="true" />
54-
<PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" IsImplicitlyDefined="true" />
55-
<PackageReference Include="Microsoft.DotNet.MacOsPkg.Cli" Version="$(MicrosoftDotNetMacOsPkgVersion)" IsImplicitlyDefined="true" />
56-
<PackageReference Include="Microsoft.SymbolUploader.Build.Task" Version="$(MicrosoftSymbolUploaderBuildTaskVersion)" Condition="'$(PublishToSymbolServer)' == 'true'" IsImplicitlyDefined="true" />
57-
<PackageReference Include="Microsoft.DotNet.Build.Tasks.VisualStudio" Version="$(MicrosoftDotNetBuildTasksVisualStudioVersion)" Condition="'$(UsingToolVSSDK)' == 'true'" IsImplicitlyDefined="true" />
48+
<PackageDownload Include="sn" Version="$(SNVersion)" />
49+
<PackageDownload Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="[$(MicrosoftVisualStudioEngMicroBuildCoreVersion)]" />
50+
<PackageDownload Include="MicroBuild.Core.Sentinel" Version="[1.0.0]" />
51+
<PackageDownload Include="vswhere" Version="$(VSWhereVersion)" />
52+
<PackageDownload Include="Microsoft.Signed.Wix" Version="[$(MicrosoftSignedWixVersion)]" />
53+
<PackageDownload Include="Microsoft.WixToolset.Sdk" Version="[$(MicrosoftWixToolsetSdkVersion)]" />
54+
<PackageDownload Include="Microsoft.DotNet.SignTool" Version="[$(MicrosoftDotNetSignToolVersion)]" />
55+
<PackageDownload Include="Microsoft.DotNet.MacOsPkg.Cli" Version="[$(MicrosoftDotNetMacOsPkgVersion)]" />
56+
<PackageDownload Include="Microsoft.SymbolUploader.Build.Task" Version="[$(MicrosoftSymbolUploaderBuildTaskVersion)]" Condition="'$(PublishToSymbolServer)' == 'true'" />
57+
<PackageDownload Include="Microsoft.DotNet.Build.Tasks.VisualStudio" Version="[$(MicrosoftDotNetBuildTasksVisualStudioVersion)]" Condition="'$(UsingToolVSSDK)' == 'true'" />
5858
</ItemGroup>
5959

6060
<!-- Unlike the items above, we should restore M.D.B.T.F in source build scenarios.
6161
Only reference this if publishing is enabled as that is the only scenario where the targets file which this package
6262
provides is being imported (from Publish.proj). -->
6363
<ItemGroup Condition="'$(RestoreBuildTaskFeed)' == 'true'">
64-
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" IsImplicitlyDefined="true" />
64+
<PackageDownload Include="Microsoft.DotNet.Build.Tasks.Feed" Version="[$(MicrosoftDotNetBuildTasksFeedVersion)]" />
6565
</ItemGroup>
6666

6767
<PropertyGroup>
@@ -96,10 +96,10 @@
9696
</Target>
9797

9898
<ItemGroup>
99-
<PackageReference Include="Microsoft.DotNet.SourceBuild.Tasks"
100-
Version="$(MicrosoftDotNetSourceBuildTasksVersion)"
101-
IsImplicitlyDefined="true"
102-
Condition="'$(TrackPrebuiltUsage)' == 'true'" />
99+
<PackageDownload Include="Microsoft.DotNet.SourceBuild.Tasks"
100+
Version="[$(MicrosoftDotNetSourceBuildTasksVersion)]"
101+
IsImplicitlyDefined="true"
102+
Condition="'$(TrackPrebuiltUsage)' == 'true'" />
103103
</ItemGroup>
104104

105105
<!-- Repository extensibility point -->

0 commit comments

Comments
 (0)