Skip to content

Commit 7deb362

Browse files
ViktorHoferViktorHofer
authored
Fine tune first join point and VMR support for it (#44153)
1 parent 23fef2d commit 7deb362

22 files changed

+156
-118
lines changed

‎Directory.Build.targets

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
45
<ItemGroup>
56
<SupportedPlatform Remove="Android" />
67
<SupportedPlatform Remove="iOS" />
@@ -36,13 +37,18 @@
3637

3738
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3839

40+
<PropertyGroup>
41+
<FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
42+
<FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
43+
<FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
44+
</PropertyGroup>
45+
3946
<!-- Optionally override arcade's test target with one which will run the tests as tools.
4047
Conditionally overriding a target requires a conditional import of another (.targets)
4148
file. -->
4249
<Import Project="OverrideTest.targets"
4350
Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
4451

45-
4652
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
4753
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
4854
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))

‎eng/Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,11 @@
66
<ProjectToBuild Include="$(RepoRoot)src/VirtualMonoRepo/InitializeVMR.proj" BuildInParallel="false" />
77
</ItemGroup>
88

9+
<ItemGroup Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">
10+
<!-- For product build, build SdkResolver and VSTemplateLocator only in the second build pass as they depend on
11+
assets from other verticals that are built in the first build pass. -->
12+
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\SdkResolver.csproj" DotNetBuildPass="2" />
13+
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj" DotNetBuildPass="2" />
14+
</ItemGroup>
15+
916
</Project>

‎eng/DotNetBuild.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<InnerBuildArgs>$(InnerBuildArgs) /p:SkipBuildingInstallers=true</InnerBuildArgs>
1717
<InnerBuildArgs>$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false</InnerBuildArgs>
1818
<InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
19-
<InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) /p:PgoInstrument=true</InnerBuildArgs>
20-
<InnerBuildArgs Condition="'$(DotNetBuildPass)' != ''">$(InnerBuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</InnerBuildArgs>
2119
</PropertyGroup>
2220
</Target>
2321

‎eng/Publishing.props

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<Product>Sdk</Product>
1111
<BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
1212
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(Product)</BlobStoragePartialRelativePath>
13-
<SdkAssetManifestFileName>$(OS)-$(PlatformName)-SdkAssets.xml</SdkAssetManifestFileName>
13+
<SdkAssetManifestBuildPass Condition="'$(DotNetBuildPass)' != ''">-BuildPass$(DotNetBuildPass)</SdkAssetManifestBuildPass>
14+
<SdkAssetManifestFileName>$(OS)-$(PlatformName)-SdkAssets$(SdkAssetManifestBuildPass).xml</SdkAssetManifestFileName>
1415
<SdkAssetsManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(SdkAssetManifestFileName)</SdkAssetsManifestFilePath>
1516

1617
<TempWorkingDirectory>$(ArtifactsDir)\AssetsTmpDir\$([System.Guid]::NewGuid())</TempWorkingDirectory>
@@ -143,7 +144,7 @@
143144
<AssetManifestOS Condition="'$(SYSTEM_PHASENAME)' != ''">$(AssetManifestOS)-$(SYSTEM_PHASENAME)</AssetManifestOS>
144145
<BaseAssetManifestFileName>$(AssetManifestOS)</BaseAssetManifestFileName>
145146
<BaseAssetManifestFileName Condition="'$(SYSTEM_PHASENAME)' == '' and '$(Architecture)' != ''">$(AssetManifestOS)-$(Architecture)</BaseAssetManifestFileName>
146-
<InstallersAssetManifestFileName>$(BaseAssetManifestFileName)-installers</InstallersAssetManifestFileName>
147+
<InstallersAssetManifestFileName>$(BaseAssetManifestFileName)-installers$(SdkAssetManifestBuildPass)</InstallersAssetManifestFileName>
147148
<!-- Property AssetManifestFilePath would be reassigned by the Arcade SDK, so use a different name (InstallersAssetManifestFilePath) -->
148149
<InstallersAssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(InstallersAssetManifestFileName).xml</InstallersAssetManifestFilePath>
149150

@@ -183,7 +184,10 @@
183184
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
184185
</ItemGroup>
185186

186-
<Target Name="PublishSdkAssetsAndChecksums" BeforeTargets="Publish" Condition="$(DotNetPublishUsingPipelines)">
187+
<!-- Publish the sdk and the checksums only in the initial build pass. -->
188+
<Target Name="PublishSdkAssetsAndChecksums"
189+
BeforeTargets="Publish"
190+
Condition="'$(DotNetPublishUsingPipelines)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
187191
<ReadLinesFromFile File="$(ArtifactsTmpDir)FullNugetVersion.version">
188192
<Output TaskParameter="Lines" PropertyName="FullNugetVersion" />
189193
</ReadLinesFromFile>

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ parameters:
106106
type: string
107107

108108
jobs:
109-
- job: ${{ parameters.buildName }}_${{ parameters.architecture }}
109+
- job: ${{ parameters.buildName }}_${{ parameters.architecture }}${{ replace(format('_BuildPass{0}', coalesce(parameters.buildPass, '1')), '_BuildPass1', '') }}
110110
pool: ${{ parameters.pool }}
111111

112112
# Currently, CodeQL slows the build down too much
@@ -117,9 +117,12 @@ jobs:
117117
timeoutInMinutes: 240
118118

119119
${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}:
120-
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
121-
# The build shortcuts when stage 1 build fails and doesn't produce the SDK.
122-
condition: succeededOrFailed()
120+
${{ if eq(parameters.buildPass, '') }}:
121+
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
122+
# The build shortcuts when stage 1 build fails and doesn't produce the SDK.
123+
condition: succeededOrFailed()
124+
${{ else }}:
125+
condition: succeeded()
123126
dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}
124127
variables:
125128
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
@@ -150,13 +153,6 @@ jobs:
150153
- name: sourcesPath
151154
value: $(vmrPath)
152155

153-
- ${{ if ne(parameters.buildPass, '') }}:
154-
- name: artifactsSuffix
155-
value: '_buildpass${{ parameters.buildPass }}'
156-
- ${{ else }}:
157-
- name: artifactsSuffix
158-
value: ''
159-
160156
templateContext:
161157
outputs:
162158
- output: pipelineArtifact
@@ -168,7 +164,7 @@ jobs:
168164

169165
- output: pipelineArtifact
170166
path: $(Build.ArtifactStagingDirectory)/publishing
171-
artifact: $(Agent.JobName)_Artifacts$(artifactsSuffix)
167+
artifact: $(Agent.JobName)_Artifacts
172168
displayName: Publish Artifacts
173169
sbomEnabled: true
174170

@@ -207,15 +203,15 @@ jobs:
207203
208204
- ${{ if ne(parameters.reuseBuildArtifactsFrom,'') }}:
209205
- ${{ each reuseBuildArtifacts in parameters.reuseBuildArtifactsFrom }}:
210-
- download: current
211-
artifact: ${{ reuseBuildArtifacts }}_Artifacts
212-
patterns: |
213-
**/Private.SourceBuilt.Artifacts.*.tar.gz
214-
**/dotnet-sdk-*.tar.gz
215-
**/*.nupkg
216-
displayName: Download Previous Build (${{ reuseBuildArtifacts }})
217-
218206
- ${{ if eq(parameters.buildSourceOnly, true) }}:
207+
- download: current
208+
artifact: ${{ reuseBuildArtifacts }}_Artifacts
209+
patterns: |
210+
**/Private.SourceBuilt.Artifacts.*.tar.gz
211+
**/dotnet-sdk-*.tar.gz
212+
**/*.nupkg
213+
displayName: Download Previous Build (${{ reuseBuildArtifacts }})
214+
219215
- task: CopyFiles@2
220216
displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
221217
inputs:
@@ -224,13 +220,16 @@ jobs:
224220
TargetFolder: $(sourcesPath)/prereqs/packages/archive/
225221

226222
- ${{ else }}:
223+
- download: current
224+
artifact: ${{ reuseBuildArtifacts }}_Artifacts
225+
displayName: Download Previous Build (${{ reuseBuildArtifacts }})
226+
227227
- task: CopyFiles@2
228-
displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - NuGet Packages)
228+
displayName: Copy Previous Build (${{ reuseBuildArtifacts }})
229229
inputs:
230-
SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/packages
231-
Contents: '**/*.nupkg'
230+
SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/
232231
OverWrite: false
233-
TargetFolder: $(sourcesPath)/artifacts/packages/
232+
TargetFolder: $(sourcesPath)/artifacts/
234233

235234
- ${{ if eq(parameters.withPreviousSDK, 'true') }}:
236235
- script: |
@@ -502,11 +501,6 @@ jobs:
502501
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "Updated*.txt"
503502
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.trx"
504503
}
505-
506-
# check if we have assets to publish
507-
if (Test-Path "artifacts/assets/Release/*") {
508-
echo "##vso[task.setvariable variable=hasAssets]true"
509-
}
510504
displayName: Prepare BuildLogs staging directory and check assets
511505
continueOnError: true
512506
condition: succeededOrFailed()
@@ -545,12 +539,6 @@ jobs:
545539
if [[ "${{ parameters.buildSourceOnly }}" == "True" ]]; then
546540
find artifacts/prebuilt-report/ -exec rsync -R {} -t ${targetFolder} \;
547541
fi
548-
549-
550-
# check if we have assets to publish
551-
if [ -n "$(ls -A 'artifacts/assets/Release/')" ]; then
552-
echo "##vso[task.setvariable variable=hasAssets]true"
553-
fi
554542
displayName: Prepare BuildLogs staging directory and check assets
555543
continueOnError: true
556544
condition: succeededOrFailed()
@@ -592,8 +580,8 @@ jobs:
592580
inputs:
593581
SourceFolder: $(sourcesPath)/artifacts
594582
Contents: |
595-
VerticalManifest.xml
596583
assets/**
584+
manifests/**
597585
TargetFolder: $(Build.ArtifactStagingDirectory)/publishing
598586
displayName: Copy artifacts to Artifact Staging Directory
599587

@@ -607,6 +595,6 @@ jobs:
607595

608596
- ${{ if or(ne(variables['System.TeamProject'], 'internal'), eq(variables['Build.Reason'], 'PullRequest')) }}:
609597
- publish: $(Build.ArtifactStagingDirectory)/publishing
610-
artifact: $(Agent.JobName)_Artifacts$(artifactsSuffix)
598+
artifact: $(Agent.JobName)_Artifacts
611599
displayName: Publish Artifacts
612600
continueOnError: true

‎eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,6 @@ stages:
391391
pool: ${{ parameters.pool_Windows }}
392392
targetOS: windows
393393
targetArchitecture: x64
394-
${{ if in(parameters.scope, 'full') }}:
395-
buildPass: 2
396-
reuseBuildArtifactsFrom:
397-
- Windows_x86
398-
- Windows_arm64
399394

400395
- template: ../jobs/vmr-build.yml
401396
parameters:
@@ -1098,3 +1093,21 @@ stages:
10981093
targetArchitecture: arm64
10991094
extraProperties: /p:PgoInstrument=true
11001095
runTests: false
1096+
1097+
# Build Pass 2 verticals
1098+
1099+
- template: ../jobs/vmr-build.yml
1100+
parameters:
1101+
buildName: Windows
1102+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
1103+
vmrBranch: ${{ variables.VmrBranch }}
1104+
architecture: x64
1105+
pool: ${{ parameters.pool_Windows }}
1106+
targetOS: windows
1107+
targetArchitecture: x64
1108+
runTests: false
1109+
buildPass: 2
1110+
reuseBuildArtifactsFrom:
1111+
- Windows_x64
1112+
- Windows_x86
1113+
- Windows_arm64

‎sdk.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Ins
501501
EndProject
502502
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\Installer\redist-installer\projects\SdkResolver.csproj", "{27E399C0-6F91-45D6-A63D-041DA41CCFDF}"
503503
EndProject
504-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\Installer\redist-installer\projects\VSTemplateLocator.csproj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
504+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
505505
EndProject
506506
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{21C21975-84C1-4A24-8E21-F7EC790A4584}"
507507
EndProject

‎src/Installer/redist-installer/projects/SdkResolver.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
99
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
10-
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' == ''">true</ExcludeFromDotNetBuild>
10+
<!-- For product build, this project only builds in the second build pass as it depends on assets other
11+
verticals that are built in the first build pass. -->
12+
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != '2'">true</ExcludeFromDotNetBuild>
1113
</PropertyGroup>
1214

1315
<ItemGroup>

‎src/Installer/redist-installer/packaging/windows/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec renamed to ‎src/Installer/redist-installer/projects/VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec

File renamed without changes.

‎src/Installer/redist-installer/projects/VSTemplateLocator.csproj renamed to ‎src/Installer/redist-installer/projects/VSTemplateLocator/VSTemplateLocator.csproj

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
1+
<Project Sdk="Microsoft.Build.NoTargets">
22

33
<PropertyGroup>
44
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
55
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
6-
<GenerateDependencyFile>false</GenerateDependencyFile>
76
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
8-
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
97
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
10-
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' == ''">true</ExcludeFromDotNetBuild>
8+
<!-- For product build, this project only builds in the second build pass as it depends on assets other
9+
verticals that are built in the first build pass. -->
10+
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != '2'">true</ExcludeFromDotNetBuild>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
@@ -21,10 +21,13 @@
2121
<ProjectReference Include="$(RepoRoot)src\Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" ReferenceOutputAssembly="false" />
2222
</ItemGroup>
2323

24-
<Target Name="GenerateLayout"
25-
Condition="'$(OS)' == 'Windows_NT' and '$(_SuppressAllTargets)' != 'true'"
26-
BeforeTargets="AfterBuild">
27-
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
24+
<Target Name="GenerateLayout">
25+
<!-- Set these here early enough for inputs & outputs in the GenerateVSTemplateLocatorNupkg target. -->
26+
<PropertyGroup>
27+
<VSTemplateLocatorNuspecFile>$(MSBuildThisFileDirectory)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
28+
<VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>
29+
<GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)../../packaging/windows/generatenupkg.ps1</GenerateNupkgPowershellScript>
30+
</PropertyGroup>
2831

2932
<RemoveDir Directories="$(OutputPath)" />
3033
<MakeDir Directories="$(OutputPath)" />
@@ -41,6 +44,30 @@
4144
</ItemGroup>
4245

4346
<Copy SourceFiles="@(_VSTemplateLocatorSrc)" DestinationFiles="@(_VSTemplateLocatorDst)" />
47+
48+
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
49+
</Target>
50+
51+
<!-- For product build, this only builds in the second build pass as it depends on assets
52+
from other verticals that are built in the first build pass. -->
53+
<Target Name="GenerateVSTemplateLocatorNupkg"
54+
DependsOnTargets="GenerateLayout"
55+
Condition="'$(OS)' == 'Windows_NT' and
56+
'$(Architecture)' == 'x64' and
57+
'$(PgoInstrument)' != 'true' and
58+
('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2') and
59+
'$(_SuppressAllTargets)' != 'true'"
60+
Inputs="$(OutputPath)/**/*;
61+
$(VSTemplateLocatorNuspecFile);
62+
$(GenerateNupkgPowershellScript)"
63+
Outputs="$(VSTemplateLocatorNupkgFile)"
64+
AfterTargets="Build">
65+
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
66+
'$(ArtifactsDir)' ^
67+
'$(OutputPath.TrimEnd('\'))' ^
68+
'$(FullNugetVersion)' ^
69+
'$(VSTemplateLocatorNuspecFile)' ^
70+
'$(VSTemplateLocatorNupkgFile)'" />
4471
</Target>
4572

4673
</Project>

‎src/Installer/redist-installer/redist-installer.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\Layout\redist\redist.csproj" ReferenceOutputAssembly="false" />
2121
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" />
22-
<ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' != ''" />
23-
<ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' != ''" />
22+
<ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
2423
</ItemGroup>
2524

2625
<ItemGroup>
@@ -30,7 +29,6 @@
3029
<Import Project="targets\BuildCoreSdkTasks.targets" />
3130
<Import Project="targets\GetRuntimeInformation.targets" />
3231
<Import Project="targets\SetBuildDefaults.targets" />
33-
<Import Project="targets\Versions.targets" />
3432
<Import Project="targets\Branding.targets" />
3533
<Import Project="targets\BundledTemplates.targets" />
3634
<Import Project="targets\BundledManifests.targets" />

‎src/Installer/redist-installer/targets/GenerateLayout.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
</Target>
512512

513513
<Target Name="GenerateVersionFile"
514-
DependsOnTargets="SetupBundledComponents;GenerateFullNuGetVersion">
514+
DependsOnTargets="SetupBundledComponents">
515515
<WriteLinesToFile File="$(SdkOutputDirectory).version"
516516
Lines="$(SourceRevisionId);$(Version);$(Rid);$(FullNugetVersion);$(SdkFeatureBand)"
517517
Overwrite="true" />
@@ -611,7 +611,6 @@
611611
DependsOnTargets="DownloadBundledComponents;
612612
CleanLayoutPath;
613613
LayoutBundledComponents;
614-
GenerateFullNuGetVersion;
615614
GenerateVersionFile;
616615
CopyKnownWorkloadManifestFile;
617616
GenerateBundledVersions;

0 commit comments

Comments
 (0)