|
26 | 26 | <ToolsetInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg</ToolsetInstallerNupkgFile>
|
27 | 27 | <SdkPlaceholderInstallerNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec</SdkPlaceholderInstallerNuspecFile>
|
28 | 28 | <SdkPlaceholderInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg</SdkPlaceholderInstallerNupkgFile>
|
29 |
| - <VSToolsNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile> |
30 |
| - <VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile> |
31 | 29 |
|
32 | 30 | <SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
|
33 |
| - <VSToolsResolverNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile> |
34 |
| - <VSToolsResolverNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.Resolver.nupkg</VSToolsResolverNupkgFile> |
35 | 31 |
|
36 | 32 | <SdkMSBuildExtensionsNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
|
37 | 33 | <SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
|
|
441 | 437 | </ItemGroup>
|
442 | 438 | </Target>
|
443 | 439 |
|
444 |
| - <Target Name="GenerateVSToolsNupkg" |
445 |
| - DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs" |
446 |
| - Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86' " |
447 |
| - Inputs="$(RedistLayoutPath)/**/*; |
448 |
| - $(VSToolsNuspecFile); |
449 |
| - $(GenerateNupkgPowershellScript)" |
450 |
| - Outputs="$(VSToolsNupkgFile)"> |
451 |
| - <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^ |
452 |
| - '$(ArtifactsDir)' ^ |
453 |
| - '$(RedistLayoutPath.TrimEnd('\'))' ^ |
454 |
| - '$(FullNugetVersion)' ^ |
455 |
| - '$(VSToolsNuspecFile)' ^ |
456 |
| - '$(VSToolsNupkgFile)' ^ |
457 |
| - '$(Architecture)'" /> |
458 |
| - </Target> |
459 |
| - |
460 |
| - <!-- |
461 |
| - This project references assets from multiple architectures, so it can't be built until we have a join point job that can pull assets from multiple legs. |
462 |
| - https://github.com/dotnet/source-build/issues/4336 |
463 |
| - --> |
464 |
| - <Target Name="GenerateVSToolsResolverNupkg" |
465 |
| - DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs" |
466 |
| - Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86' And '$(DotNetBuild)' != 'true'" |
467 |
| - Inputs="$(SdkResolverLayoutPath)/**/*; |
468 |
| - $(VSToolsResolverNuspecFile); |
469 |
| - $(GenerateNupkgPowershellScript)" |
470 |
| - Outputs="$(VSToolsResolverNupkgFile)"> |
471 |
| - <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^ |
472 |
| - '$(ArtifactsDir)' ^ |
473 |
| - '$(SdkResolverLayoutPath.TrimEnd('\'))' ^ |
474 |
| - '$(FullNugetVersion)' ^ |
475 |
| - '$(VSToolsResolverNuspecFile)' ^ |
476 |
| - '$(VSToolsResolverNupkgFile)'" /> |
477 |
| - </Target> |
478 |
| - |
479 | 440 | <Target Name="GenerateSdkMSBuildExtensionsNupkg"
|
480 | 441 | DependsOnTargets="GenerateLayout;GenerateMSBuildExtensions;MsiTargetsSetupInputOutputs"
|
481 | 442 | Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
|
|
527 | 488 | GenerateToolsetNupkg;
|
528 | 489 | GenerateTemplatesNupkgs;
|
529 | 490 | GenerateSdkPlaceholderNupkg;
|
530 |
| - GenerateVSToolsNupkg; |
531 |
| - GenerateVSToolsResolverNupkg; |
532 | 491 | GenerateSdkMSBuildExtensionsNupkg;
|
533 | 492 | GenerateVSTemplateLocatorNupkg"
|
534 | 493 | Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />
|
|
0 commit comments