Skip to content

Commit d472e06

Browse files
ViktorHoferViktorHofer
committed
Change redist-installer references to redist and make repo buildable
1 parent c2c424f commit d472e06

24 files changed

+126
-166
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
@@ -29,7 +29,7 @@
2929

3030
<Target Name="GetNonStableProductVersion">
3131
<!-- Retrieve the non-stable product version. -->
32-
<MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
32+
<MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"
3333
Targets="ReturnProductVersion">
3434
<Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
3535
</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>544cf0ccbc744015001933658c04f4bf364abb07</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 & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
484484
EndProject
485485
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
486486
EndProject
487-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
488-
EndProject
489487
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
490488
EndProject
491489
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}"
@@ -944,10 +942,6 @@ Global
944942
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
945943
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
946944
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.Build.0 = Release|Any CPU
947-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
948-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.Build.0 = Debug|Any CPU
949-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.ActiveCfg = Release|Any CPU
950-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.Build.0 = Release|Any CPU
951945
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
952946
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
953947
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1184,7 +1178,6 @@ Global
11841178
{7382A1CB-AA9A-4136-A548-17D7A67C6B0C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11851179
{D7495CE7-64E5-4715-9304-799A41EC1D71} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
11861180
{32DA04FF-A951-43EA-B2FA-86A825009A97} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
1187-
{FAADC193-BA41-449D-97CE-0EF82836046A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11881181
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11891182
{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11901183
{21C21975-84C1-4A24-8E21-F7EC790A4584} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}

‎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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<PropertyGroup>
66
<DownloadsFolder>$(ArtifactsObjDir)redist-downloads\</DownloadsFolder>
77

8-
<SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
9-
<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
8+
<RedistBasedOutputPath>$(ArtifactsBinDir)redist\$(Configuration)\</RedistBasedOutputPath>
9+
<SdkLayoutOutputDirectory>$(RedistBasedOutputPath)layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
10+
<RedistLayoutPath>$(RedistBasedOutputPath)dotnet\</RedistLayoutPath>
1011
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
1112

12-
<RedistInstallerLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\dotnet\</RedistInstallerLayoutPath>
13-
<SdkInternalLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\i\</SdkInternalLayoutPath>
13+
<RedistInstallerBaseOutputPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\</RedistInstallerBaseOutputPath>
14+
<RedistInstallerLayoutPath>$(RedistInstallerBaseOutputPath)dotnet\</RedistInstallerLayoutPath>
15+
<SdkInternalLayoutPath>$(RedistInstallerBaseOutputPath)i\</SdkInternalLayoutPath>
1416
<InstallerOutputDirectory>$(RedistInstallerLayoutPath)sdk\$(Version)\</InstallerOutputDirectory>
1517
</PropertyGroup>
1618

‎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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
56
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
67
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
78
<AssetTargetFallback>dotnet5.4</AssetTargetFallback>
@@ -17,6 +18,9 @@
1718
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1205</MSBuildWarningsAsMessages>
1819
<!-- The D.B.targets file is in subfolder so that the tools projects don't import it. -->
1920
<DirectoryBuildTargetsPath>$(MSBuildThisFileDirectory)targets\Directory.Build.targets</DirectoryBuildTargetsPath>
21+
<!-- Needed to calculate the stable FileVersion for the sdk bundle version. -->
22+
<IsShippingPackage>true</IsShippingPackage>
23+
<NoWarn>$(NoWarn);NU1505</NoWarn>
2024
</PropertyGroup>
2125

2226
<ItemGroup>
@@ -47,9 +51,11 @@
4751
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildVersion)" />
4852
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildVersion)" />
4953
<PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildVersion)" />
54+
55+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
5056
</ItemGroup>
5157

52-
<ItemGroup>
58+
<ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
5359
<!-- These project references with ReferenceOutputAssembly="false" should also set SkipGetTargetFrameworkProperties="true". Otherwise, only the inner
5460
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
5561
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,8 +69,16 @@
6369
<ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
6470
<ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
6571
<ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
72+
73+
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" />
6674
</ItemGroup>
6775

76+
<ItemGroup>
77+
<ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
78+
</ItemGroup>
79+
80+
<Target Name="ReturnProductVersion" Returns="$(FullNugetVersion)" />
81+
6882
<ItemGroup>
6983
<Content Include="minimumMSBuildVersion">
7084
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎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/Crossgen.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageDownload Include="$(RuntimeNETCrossgenPackageName)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
1616
</ItemGroup>
1717

18-
<Target Name="CrossgenLayout" Condition="'$(IsCrossgenSupported)' == 'true'">
18+
<Target Name="CrossgenLayout" DependsOnTargets="GenerateLayout" Condition="'$(IsCrossgenSupported)' == 'true'">
1919
<PropertyGroup>
2020
<CrossgenPath>$(NuGetPackageRoot)$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
2121
<CreateCrossgenSymbols Condition="'$(CreateCrossgenSymbols)' == ''">true</CreateCrossgenSymbols>

‎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="BundledTemplates.targets" />
16+
<Import Project="BundledDotnetTools.targets" />
17+
<Import Project="GenerateBundledVersions.targets" />
18+
<Import Project="Crossgen.targets" />
19+
<Import Project="GenerateInstallerLayout.targets" />
20+
<Import Project="GenerateArchives.targets" />
21+
22+
<Import Project="OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
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: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,14 +1391,14 @@ Copyright (c) .NET Foundation. All rights reserved.
13911391

13921392
<Target Name="GenerateBundledMSBuildProps">
13931393
<PropertyGroup>
1394-
<MinimumMSBuildVersionFile>$(RedistInstallerLayoutPath)sdk/$(Version)/minimumMSBuildVersion</MinimumMSBuildVersionFile>
1394+
<MinimumMSBuildVersionFile>$(MSBuildProjectDirectory)\minimumMSBuildVersion</MinimumMSBuildVersionFile>
13951395
<BundledMSBuildPropsFileName>Microsoft.NETCoreSdk.BundledMSBuildInformation.props</BundledMSBuildPropsFileName>
13961396
<_ShippingMSBuildVersion>$(MicrosoftBuildVersion)</_ShippingMSBuildVersion>
13971397
<_ShippingMSBuildVersion Condition="$(_ShippingMSBuildVersion.Contains('-'))">$(MicrosoftBuildVersion.Split('-')[0])</_ShippingMSBuildVersion>
13981398
<BundledMSBuildVersion>$(_ShippingMSBuildVersion)</BundledMSBuildVersion>
13991399
</PropertyGroup>
14001400

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

14031403
<ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
14041404
<Output TaskParameter="Lines" PropertyName="MinimumMSBuildVersion"/>
@@ -1442,13 +1442,11 @@ Copyright (c) .NET Foundation. All rights reserved.
14421442
</ItemGroup>
14431443

14441444
<Target Name="LayoutRuntimeGraph"
1445-
DependsOnTargets="GenerateBundledVersionsProps">
1446-
1445+
DependsOnTargets="GenerateBundledVersionsProps;PublishPortableRuntimeIdentifierGraph">
14471446
<GenerateSdkRuntimeIdentifierChain
14481447
RuntimeIdentifier="$(PortableProductMonikerRid)"
1449-
RuntimeIdentifierGraphPath="$(InstallerOutputDirectory)PortableRuntimeIdentifierGraph.json"
1448+
RuntimeIdentifierGraphPath="$(RedistBasedOutputPath)PortableRuntimeIdentifierGraph.json"
14501449
RuntimeIdentifierChainOutputPath="$(InstallerOutputDirectory)NETCoreSdkRuntimeIdentifierChain.txt" />
1451-
14521450
</Target>
14531451

14541452
</Project>

0 commit comments

Comments
 (0)