Skip to content

Pin Platform Manifest file to 6.0.0 Version of the file during servicing #61260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Anipik wants to merge 4 commits into from
Closed

Pin Platform Manifest file to 6.0.0 Version of the file during servicing #61260

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7282421
Use checked in version of manifest for servicing.
Nov 5, 2021
96e1fef
check in the manifest file
Nov 5, 2021
cc806f5
use create platform mainfest property
Nov 5, 2021
7e3c9a7
fix the empty space
Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use checked in version of manifest for servicing.
  • Loading branch information
Anirudh Agnihotry committed Nov 5, 2021
commit 72824214fb47b59dfe80d15c34d6e3f9c4c57ad1
6 changes: 6 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<PlatformPackageType>TargetingPack</PlatformPackageType>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
<SkipGeneratingPlatformManifest Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</SkipGeneratingPlatformManifest>
<ArchiveName>dotnet-targeting-pack</ArchiveName>
<InstallerName>dotnet-targeting-pack</InstallerName>
<OverridePackageId Condition="'$(PgoInstrument)' != ''">$(SharedFrameworkName).PGO</OverridePackageId>
Expand All @@ -19,4 +20,9 @@
<FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
</ItemGroup>
</Target>

<ItemGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<ReferencePlatformManifestPath Include="PlatformManifest.txt" TargetPath="data" GeneratedBuildFile="true" />
Copy link
Member

@ericstj ericstj Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we need GeneratedBuildFile here or not, @jkoritzinsky?

Copy link
Member

@ericstj ericstj Nov 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this metadata is required to avoid it showing up in the framework deps file here: https://github.com/dotnet/arcade/blob/0602cfaab1dfdbf7802dd3d2876fd17cf4ae04a7/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs#L57

I think we can avoid the extra item though.

<FilesToPackage Include="@(ReferencePlatformManifestPath )" />
</ItemGroup>
</Project>