Skip to content

Commit 338f561

Browse files
ViktorHoferViktorHofer
committed
Change redist-installer references to redist and make repo buildable
1 parent e96f06d commit 338f561

23 files changed

+126
-179
lines changed

‎eng/Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
it depends on assets from other verticals that are built in the first build pass. -->
1414
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
1515
'$(OS)' == 'Windows_NT'">
16-
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
16+
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="2" />
1717
</ItemGroup>
1818

1919
</Project>

‎eng/Publishing.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<Target Name="GetNonStableProductVersion">
3838
<!-- Retrieve the non-stable product version. -->
39-
<MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
39+
<MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"
4040
Targets="ReturnProductVersion">
4141
<Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
4242
</MSBuild>

‎eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<Sha>79edb640661c29fc3917eac0a6f06e908f4cf617</Sha>
8686
<SourceBuild RepoName="runtime" ManagedOnly="false" />
8787
</Dependency>
88-
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
88+
<!-- Change blob version in GenerateInstallerLayout.targets if this is unpinned to service targeting pack -->
8989
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
9090
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
9191
<Uri>https://github.com/dotnet/core-setup</Uri>

‎sdk.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
485485
EndProject
486486
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
487487
EndProject
488-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
489-
EndProject
490488
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
491489
EndProject
492490
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Redist.Common.Net.Core.SDK.VSTemplateLocator", "src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
@@ -945,10 +943,6 @@ Global
945943
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
946944
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
947945
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.Build.0 = Release|Any CPU
948-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
949-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.Build.0 = Debug|Any CPU
950-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.ActiveCfg = Release|Any CPU
951-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.Build.0 = Release|Any CPU
952946
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
953947
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
954948
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎source-build.slnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
2121
"src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
2222
"src\\Containers\\packaging\\package.csproj",
23-
"src\\Layout\\redist-installer\\redist-installer.proj",
2423
"src\\Layout\\pkg\\dotnet-sdk.proj",
2524
"src\\Layout\\redist\\redist.csproj",
2625
"src\\Layout\\redist\\tools\\tool_fsc.csproj",

‎src/Layout/Directory.Build.props

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<ExeExtension Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))"></ExeExtension>
3232

3333
<Rid>$(OSName)-$(Architecture)</Rid>
34-
<ProductMonikerRid Condition="'$(ProductMonikerRid)' == ''">$(Rid)</ProductMonikerRid>
34+
<ProductMonikerRid>$(Rid)</ProductMonikerRid>
3535

3636
<PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
3737
<PortableRid>$(PortableOSName)-$(Architecture)</PortableRid>
38-
<PortableProductMonikerRid Condition="'$(PortableProductMonikerRid)' == ''">$(PortableRid)</PortableProductMonikerRid>
38+
<PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
3939
</PropertyGroup>
4040

4141
<PropertyGroup>
@@ -69,4 +69,8 @@
6969
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
7070
</PropertyGroup>
7171

72+
<PropertyGroup>
73+
<SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)pkg\</SdkPkgSourcesRootDirectory>
74+
</PropertyGroup>
75+
7276
</Project>

‎src/Layout/Directory.Build.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
1010
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
1111

12-
<RedistInstallerLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\dotnet\</RedistInstallerLayoutPath>
13-
<SdkInternalLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\i\</SdkInternalLayoutPath>
12+
<RedistInstallerBaseOutputPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\</RedistInstallerBaseOutputPath>
13+
<RedistInstallerLayoutPath>$(RedistInstallerBaseOutputPath)dotnet\</RedistInstallerLayoutPath>
14+
<SdkInternalLayoutPath>$(RedistInstallerBaseOutputPath)i\</SdkInternalLayoutPath>
1415
<InstallerOutputDirectory>$(RedistInstallerLayoutPath)sdk\$(Version)\</InstallerOutputDirectory>
1516
</PropertyGroup>
1617

‎src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<ProjectReference Include="$(RepoRoot)src\Microsoft.Net.Sdk.AnalyzerRedirecting\Microsoft.Net.Sdk.AnalyzerRedirecting.csproj" />
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<!-- Shared infra to build and use the sdk-tasks -->

‎src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">

‎src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">

‎src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">

‎src/Layout/pkg/dotnet-sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<ProjectReference Include="..\redist-installer\redist-installer.proj" ReferenceOutputAssembly="false" />
32+
<ProjectReference Include="..\redist\redist.csproj" ReferenceOutputAssembly="false" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/Layout/redist-installer/Directory.Build.targets

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/Layout/redist-installer/redist-installer.proj

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/Layout/redist/redist.csproj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1205</MSBuildWarningsAsMessages>
1818
<!-- The D.B.targets file is in subfolder so that the tools projects don't import it. -->
1919
<DirectoryBuildTargetsPath>$(MSBuildThisFileDirectory)targets\Directory.Build.targets</DirectoryBuildTargetsPath>
20+
<!-- Needed to calculate the stable FileVersion for the sdk bundle version. -->
21+
<IsShippingPackage>true</IsShippingPackage>
22+
<NoWarn>$(NoWarn);NU1505</NoWarn>
2023
</PropertyGroup>
2124

2225
<ItemGroup>
@@ -47,9 +50,11 @@
4750
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildVersion)" />
4851
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildVersion)" />
4952
<PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildVersion)" />
53+
54+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
5055
</ItemGroup>
5156

52-
<ItemGroup>
57+
<ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
5358
<!-- These project references with ReferenceOutputAssembly="false" should also set SkipGetTargetFrameworkProperties="true". Otherwise, only the inner
5459
build of a multi-targeted project will be built to fulfill the project reference, and if the redist project depends on output that is created
5560
in the outer build (which is the case for some of these references), there may be sporadic incorrect builds if the outer build happens to run concurrently
@@ -63,6 +68,12 @@
6368
<ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
6469
<ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
6570
<ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
71+
72+
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
73+
</ItemGroup>
74+
75+
<ItemGroup>
76+
<ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
6677
</ItemGroup>
6778

6879
<ItemGroup>
@@ -98,4 +109,6 @@
98109
</ItemGroup>
99110
</Target>
100111

112+
<Target Name="ReturnProductVersion" Returns="$(FullNugetVersion)" />
113+
101114
</Project>

‎src/Layout/redist/targets/BundledTemplates.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@
7676

7777
<Target Name="LayoutTemplatesForMSI" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates" Condition="$(ProductMonikerRid.StartsWith('win'))">
7878
<Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
79-
DestinationFolder="$(BaseOutputPath)$(Configuration)\templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
79+
DestinationFolder="$(RedistInstallerBaseOutputPath)templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
8080

8181
<!-- Copy the current Microsoft.DotNet.Common.ItemTemplates and Microsoft.DotNet.Common.ProjectTemplates packages to the layout location. -->
8282
<PropertyGroup>
8383
<CurrentTemplateInstallPath Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '10.0'">%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)</CurrentTemplateInstallPath>
8484
<CurrentTemplateFrameworkVersion>%(CurrentVersionBundledTemplates.TemplateFrameworkVersion)</CurrentTemplateFrameworkVersion>
8585
</PropertyGroup>
8686
<Copy SourceFiles="@(RepoTemplate)"
87-
DestinationFiles="$(BaseOutputPath)$(Configuration)\templates-$(CurrentTemplateFrameworkVersion)\templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
87+
DestinationFiles="$(RedistInstallerBaseOutputPath)templates-$(CurrentTemplateFrameworkVersion)\templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
8888
</Target>
8989

9090
</Project>

‎src/Layout/redist/targets/Directory.Build.targets

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,25 @@
55
<!-- Shared infra to build and use the sdk-tasks -->
66
<Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
77

8-
<Import Project="BundledSdks.targets" />
9-
<Import Project="PublishDotnetWatch.targets" />
10-
<Import Project="GenerateLayout.targets" />
11-
<Import Project="OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
8+
<Import Project="RestoreLayout.targets" />
9+
<Import Project="BundledManifests.targets" />
10+
11+
<ImportGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
12+
<Import Project="BundledSdks.targets" />
13+
<Import Project="PublishDotnetWatch.targets" />
14+
<Import Project="GenerateLayout.targets" />
15+
<Import Project="OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
16+
17+
<Import Project="BundledTemplates.targets" />
18+
<Import Project="BundledDotnetTools.targets" />
19+
<Import Project="GenerateBundledVersions.targets" />
20+
<Import Project="Crossgen.targets" />
21+
<Import Project="GenerateInstallerLayout.targets" />
22+
<Import Project="GenerateArchives.targets" />
23+
</ImportGroup>
24+
25+
<!-- Installers -->
26+
<Import Project="GenerateMSIs.targets" Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'" />
27+
<Import Project="GeneratePKG.targets" Condition="'$(OSName)' == 'osx' and '$(SkipBuildingInstallers)' != 'true'" />
1228

1329
</Project>

‎src/Layout/redist/targets/GenerateArchives.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<Target Name="GenerateArchives"
4-
DependsOnTargets="GenerateLayout"
5-
BeforeTargets="AfterBuild">
4+
DependsOnTargets="GenerateInstallerLayout"
5+
AfterTargets="Build">
66
<!-- When running in Docker under a Windows host, tar is warning "file changed as we read it" for several files and returning exit code 1.
77
So this flag allows that to be ignored. -->
88
<PropertyGroup Condition="'$(IgnoreTarExitCode)' == ''">

‎src/Layout/redist/targets/GenerateBundledVersions.targets

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,6 @@
512512
LatestVersion="2.2.8" />
513513
</ItemGroup>
514514

515-
<PropertyGroup>
516-
<PortableProductMonikerRid Condition="'$(PortableProductMonikerRid)' == ''">$(ProductMonikerRid)</PortableProductMonikerRid>
517-
</PropertyGroup>
518-
519515
<PropertyGroup>
520516
<BundledVersionsPropsContent>
521517
<![CDATA[
@@ -1391,14 +1387,14 @@ Copyright (c) .NET Foundation. All rights reserved.
13911387

13921388
<Target Name="GenerateBundledMSBuildProps">
13931389
<PropertyGroup>
1394-
<MinimumMSBuildVersionFile>$(RedistInstallerLayoutPath)sdk/$(Version)/minimumMSBuildVersion</MinimumMSBuildVersionFile>
1390+
<MinimumMSBuildVersionFile>$(MSBuildProjectDirectory)\minimumMSBuildVersion</MinimumMSBuildVersionFile>
13951391
<BundledMSBuildPropsFileName>Microsoft.NETCoreSdk.BundledMSBuildInformation.props</BundledMSBuildPropsFileName>
13961392
<_ShippingMSBuildVersion>$(MicrosoftBuildVersion)</_ShippingMSBuildVersion>
13971393
<_ShippingMSBuildVersion Condition="$(_ShippingMSBuildVersion.Contains('-'))">$(MicrosoftBuildVersion.Split('-')[0])</_ShippingMSBuildVersion>
13981394
<BundledMSBuildVersion>$(_ShippingMSBuildVersion)</BundledMSBuildVersion>
13991395
</PropertyGroup>
14001396

1401-
<Error Text="No MSBuild version file found under '$(RedistInstallerLayoutPath)sdk/$(Version)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />
1397+
<Error Text="No MSBuild version file found: '$(MinimumMSBuildVersionFile)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />
14021398

14031399
<ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
14041400
<Output TaskParameter="Lines" PropertyName="MinimumMSBuildVersion"/>
@@ -1437,18 +1433,4 @@ Copyright (c) .NET Foundation. All rights reserved.
14371433
Overwrite="true" />
14381434
</Target>
14391435

1440-
<ItemGroup>
1441-
<PackageDownload Include="Microsoft.NETCore.Platforms" Version="[$(MicrosoftNETCorePlatformsPackageVersion)]" />
1442-
</ItemGroup>
1443-
1444-
<Target Name="LayoutRuntimeGraph"
1445-
DependsOnTargets="GenerateBundledVersionsProps">
1446-
1447-
<GenerateSdkRuntimeIdentifierChain
1448-
RuntimeIdentifier="$(PortableProductMonikerRid)"
1449-
RuntimeIdentifierGraphPath="$(InstallerOutputDirectory)PortableRuntimeIdentifierGraph.json"
1450-
RuntimeIdentifierChainOutputPath="$(InstallerOutputDirectory)NETCoreSdkRuntimeIdentifierChain.txt" />
1451-
1452-
</Target>
1453-
14541436
</Project>

‎src/Layout/redist/targets/GenerateLayout copy.targets renamed to ‎src/Layout/redist/targets/GenerateInstallerLayout.targets

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Copy SourceFiles="@(DotnetToolsetInternalSource)" DestinationFiles="@(DotnetToolsetInternalDestination)" SkipUnchangedFiles="true" />
6060
</Target>
6161

62-
<Target Name="RetargetTools">
62+
<Target Name="RetargetInstallerTools">
6363
<ItemGroup>
6464
<ToolRuntimeConfigPath Include="$(RedistInstallerLayoutPath)sdk/$(Version)/**/*.runtimeconfig.json" />
6565
</ItemGroup>
@@ -138,27 +138,23 @@
138138
<ReplaceFilesWithSymbolicLinks Directory="$(RedistInstallerLayoutPath)/packs/Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)/$(MicrosoftAspNetCoreAppRuntimePackageVersion)" LinkToFilesFrom="$(RedistInstallerLayoutPath)/shared/Microsoft.AspNetCore.App/$(MicrosoftAspNetCoreAppRuntimePackageVersion)" />
139139
</Target>
140140

141-
<Target Name="GenerateLayout"
141+
<Target Name="GenerateInstallerLayout"
142142
DependsOnTargets="DownloadBundledComponents;
143+
GenerateLayout;
143144
LayoutBundledComponents;
144145
GenerateVersionFile;
145146
CopyKnownWorkloadManifestFile;
146147
GenerateBundledVersions;
147-
LayoutRuntimeGraph;
148148
LayoutTemplates;
149149
LayoutManifests;
150150
LayoutBaselineWorkloadSet;
151151
LayoutWorkloadUserLocalMarker;
152152
LayoutBundledTools;
153-
RetargetTools;
153+
RetargetInstallerTools;
154154
CrossgenLayout;
155155
LayoutAppHostTemplate;
156156
ReplaceBundledRuntimePackFilesWithSymbolicLinks"
157-
BeforeTargets="AfterBuild" />
158-
159-
<Target Name="GenerateInternalLayout"
160-
DependsOnTargets="GenerateLayout"
161-
BeforeTargets="AfterBuild" >
157+
AfterTargets="Build">
162158
<RemoveDir Directories="$(SdkInternalLayoutPath)" />
163159
<MakeDir Directories="$(SdkInternalLayoutPath)" />
164160

0 commit comments

Comments
 (0)