Skip to content

Commit ead30dd

Browse files
[release/10.0.1xx-preview2] Move branding information to targets file (#47261)
Co-authored-by: Viktor Hofer <[email protected]>
1 parent f4f293c commit ead30dd

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/Installer/redist-installer/Directory.Build.props

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44

5-
<PropertyGroup>
6-
<SdkBrandName>Microsoft .NET SDK $(Version)</SdkBrandName>
7-
<ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName>
8-
<SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
9-
<NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
10-
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
11-
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
12-
<SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName>
13-
<HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
14-
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
15-
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
16-
</PropertyGroup>
17-
185
<PropertyGroup>
196
<OSName Condition="'$(OSName)' == '' AND $(Rid) != ''">$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName>
207
<OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>

src/Installer/redist-installer/Directory.Build.targets

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
44

5+
<PropertyGroup>
6+
<SdkBrandName>Microsoft .NET SDK $(Version)</SdkBrandName>
7+
<ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName>
8+
<SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
9+
<NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
10+
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
11+
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
12+
<SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName>
13+
<HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
14+
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
15+
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
16+
</PropertyGroup>
17+
518
<PropertyGroup>
619
<RedistLayoutPath>$(OutputPath)dotnet\</RedistLayoutPath>
720
<SdkInternalLayoutPath>$(OutputPath)i\</SdkInternalLayoutPath>

0 commit comments

Comments
 (0)