File tree Expand file tree Collapse file tree 2 files changed +13
-13
lines changed
src/Installer/redist-installer Expand file tree Collapse file tree 2 files changed +13
-13
lines changed Original file line number Diff line number Diff line change 2
2
3
3
<Import Project =" $([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4
4
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
-
18
5
<PropertyGroup >
19
6
<OSName Condition =" '$(OSName)' == '' AND $(Rid) != ''" >$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName >
20
7
<OSName Condition =" '$(OSName)' == ''" >$(HostOSName)</OSName >
Original file line number Diff line number Diff line change 2
2
3
3
<Import Project =" $([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
4
4
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
+
5
18
<PropertyGroup >
6
19
<RedistLayoutPath >$(OutputPath)dotnet\</RedistLayoutPath >
7
20
<SdkInternalLayoutPath >$(OutputPath)i\</SdkInternalLayoutPath >
You can’t perform that action at this time.
0 commit comments