Inline pkg descriptions for installer

dotnet · Dec 22, 2020 · 2076d7b · 2076d7b
1 parent 5a09488
commit 2076d7b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 53 deletions.
diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props
@@ -10,7 +10,6 @@
     <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageDescriptionFile>$(InstallerProjectRoot)pkg/projects/descriptions.json</PackageDescriptionFile>
     <!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
     <ProjectUrl>https://dot.net</ProjectUrl>

diff --git a/...ller/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/...ller/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <VersionProp>AppHostVersion</VersionProp>
+    <PackageDescription>Provides the .NET app bootstrapper intended for use in the application directory</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <VersionProp>HostVersion</VersionProp>
-
     <InstallerName>dotnet-host</InstallerName>
+    <PackageDescription>Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">

diff --git a/...kg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/...kg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <VersionProp>HostPolicyVersion</VersionProp>
+    <PackageDescription>Provides a CoreCLR hosting policy implementation -- configuration settings, assembly paths and assembly servicing</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...rojects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/...rojects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <VersionProp>HostResolverVersion</VersionProp>
-
     <InstallerName>dotnet-hostfxr</InstallerName>
+    <PackageDescription>Provides an implementation of framework resolution strategy used by Microsoft.NETCore.DotNetHost</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/pkg/projects/descriptions.json b/src/installer/pkg/projects/descriptions.json
diff --git a/src/installer/pkg/sfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <EnsureRuntimeIdentifierSet>true</EnsureRuntimeIdentifierSet>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
@@ -20,5 +20,7 @@
     <ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
     <GenerateInstallers>true</GenerateInstallers>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <UseRuntimePackageDisclaimer>true</UseRuntimePackageDisclaimer>
   </PropertyGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/Directory.Build.targets b/src/installer/pkg/sfx/Directory.Build.targets
@@ -1,19 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <Title>$(PackageId)</Title>
-    <RuntimeDisclaimer>Internal implementation package not meant for direct consumption. Please do not reference directly.</RuntimeDisclaimer>
-    <MinimumNuGet3VersionDescription>When using NuGet 3.x, this package requires at least version 3.4.</MinimumNuGet3VersionDescription>
-  </PropertyGroup>
-
-  <Target Name="GeneratePackageDescription"
-          BeforeTargets="GenerateNuspec"
-          DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager">
-    <PropertyGroup>
-      <PackageDescription Condition="'$(Description)' == ''">$(RuntimeDisclaimer) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription)</PackageDescription>
-      <PackageDescription Condition="'$(Description)' != ''">$(RuntimeDisclaimer) %0A$(Description) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription)</PackageDescription>
-    </PropertyGroup>
-  </Target>
-
 </Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -7,7 +7,7 @@
     <ArchiveName>dotnet-targeting-pack</ArchiveName>
     <InstallerName>dotnet-targeting-pack</InstallerName>
     <VSInsertionShortComponentName>NetCore.TargetingPack</VSInsertionShortComponentName>
-    <Description>A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.</Description>
+    <PackageDescription>A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.</PackageDescription>
   </PropertyGroup>
 
   <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">