Skip to content

Commit 75c0b99

Browse files
am11am11
authored
Consolidate RID and native file naming in MSBuild scripts (#43804)
* Consolidate RID and native file naming in MSBuild scripts * Use short variable names for native files naming convention, that are used by `framework.sharedfx.targets` in arcade, and cleanup redefinitions from crossgen2 and installer. e.g. `ExeSuffix` instead of `ApplicationFileExtension`, `LibSuffix` instead of `LibraryFileExtension` and so on. * Calculate `TargetArchitecture`, `NonPortableRuntimeOS` (for `PortableBuild`) and `PackageRID` values once for the entire livebuild, inside `eng/Configurations.props`. This implementation is a union of three varied implementations that are being deleted. * Import `names.props` once in `eng/Configurations.props` based on calculated `PackageRID` and cleanup imports of this file from various places. * Combine OS targets definition in MSBuild scripts. * Delete legacy tooling properties * Delete legacy tooling properties
1 parent 2b41889 commit 75c0b99

38 files changed

+213
-701
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</WasmAppBuilderDir>
5858
<WasmBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</WasmBuildTasksDir>
5959
<MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)'))</MonoAOTCompilerDir>
60-
60+
6161
<AppleAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))</AppleAppBuilderTasksAssemblyPath>
6262
<AndroidAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))</AndroidAppBuilderTasksAssemblyPath>
6363
<WasmAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WasmAppBuilderDir)', 'WasmAppBuilder.dll'))</WasmAppBuilderTasksAssemblyPath>
@@ -105,8 +105,6 @@
105105
</PropertyGroup>
106106

107107
<PropertyGroup>
108-
<!-- Default to portable build if not explicitly set -->
109-
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
110108
<!-- Default to discarding symbols if not explicitly set -->
111109
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == ''">false</KeepNativeSymbols>
112110
<!-- Used for launchSettings.json and runtime config files. -->

‎eng/Configurations.props

Lines changed: 109 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
steps and in the repository.
55
-->
66

7+
<PropertyGroup>
8+
<!-- Default to portable build if not explicitly set -->
9+
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
10+
</PropertyGroup>
11+
712
<PropertyGroup>
813
<LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))</LibrariesProjectRoot>
914
<CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))</CoreClrProjectRoot>
@@ -49,9 +54,6 @@
4954
</PropertyGroup>
5055

5156
<PropertyGroup>
52-
<HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRuntimeIdentifier>
53-
<HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRuntimeIdentifier>
54-
5557
<TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('OSX'))">OSX</TargetOS>
5658
<TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD</TargetOS>
5759
<TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD</TargetOS>
@@ -68,6 +70,108 @@
6870
<TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
6971
</PropertyGroup>
7072

73+
<PropertyGroup Label="CalculateOS">
74+
<_runtimeOS>$(RuntimeOS)</_runtimeOS>
75+
76+
<_parseDistroRid>$(__DistroRid)</_parseDistroRid>
77+
<_parseDistroRid Condition="'$(_parseDistroRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</_parseDistroRid>
78+
<_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-"))</_distroRidIndex>
79+
80+
<_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))</_runtimeOS>
81+
82+
<!-- _runtimeOS is calculated based on the build system OS, however if building for Browser/iOS/Android we need to let
83+
the build system to use browser/ios/android as the _runtimeOS for produced package RIDs. -->
84+
<_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())</_runtimeOS>
85+
86+
<_runtimeOSVersionIndex>$(_runtimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
87+
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(_runtimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
88+
89+
<_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX'))</_buildingInOSX>
90+
<_portableOS>linux</_portableOS>
91+
<_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl</_portableOS>
92+
<_portableOS Condition="$(_buildingInOSX)">osx</_portableOS>
93+
<_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(TargetOS)' == 'windows'">win</_portableOS>
94+
<_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd</_portableOS>
95+
<_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos</_portableOS>
96+
<_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris</_portableOS>
97+
<_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser</_portableOS>
98+
<_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios</_portableOS>
99+
<_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos</_portableOS>
100+
<_portableOS Condition="'$(_runtimeOS)' == 'android'">android</_portableOS>
101+
102+
<_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
103+
<_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
104+
105+
<!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
106+
<_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux</_portableOS>
107+
</PropertyGroup>
108+
109+
<PropertyGroup Label="CalculateArch">
110+
<_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</_hostArch>
111+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'arm'">arm</TargetArchitecture>
112+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'arm64'">arm64</TargetArchitecture>
113+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'Browser'">wasm</TargetArchitecture>
114+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetsMobile)' == 'true'">x64</TargetArchitecture>
115+
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
116+
</PropertyGroup>
117+
118+
<PropertyGroup Label="CalculateRID">
119+
<_toolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64</_toolRuntimeRID>
120+
<_toolRuntimeRID Condition="'$(_toolRuntimeRID)' == ''">$(_runtimeOS)-$(_hostArch)</_toolRuntimeRID>
121+
<!-- We build linux-musl-arm on a ubuntu container, so we can't use the toolset build for alpine runtime. We need to use portable linux RID for our toolset in order to be able to use it. -->
122+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' and $(TargetArchitecture.StartsWith('arm')) and !$(_hostArch.StartsWith('arm'))">linux-x64</_toolRuntimeRID>
123+
124+
<!-- There are no WebAssembly tools, so use the default ones -->
125+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' == 'windows'">win-x64</_toolRuntimeRID>
126+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' != 'windows' and $(_buildingInOSX)">osx-x64</_toolRuntimeRID>
127+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and '$(TargetOS)' != 'windows' and !$(_buildingInOSX)">linux-x64</_toolRuntimeRID>
128+
129+
<!-- There are no Android tools, so use the default ones -->
130+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' == 'windows'">win-x64</_toolRuntimeRID>
131+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' != 'windows' and $(_buildingInOSX)">osx-x64</_toolRuntimeRID>
132+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and '$(TargetOS)' != 'windows' and !$(_buildingInOSX)">linux-x64</_toolRuntimeRID>
133+
134+
<!-- There are no iOS or tvOS tools and it can be built on OSX only, so use that -->
135+
<_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID>
136+
<MicrosoftNetCoreIlasmPackageRuntimeId>$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
137+
138+
<_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</_packageRID>
139+
<PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID>
140+
<PackageRID Condition="'$(PackageRID)' == ''">$(_runtimeOS)-$(TargetArchitecture)</PackageRID>
141+
142+
<_outputRID Condition="'$(TargetOS)' == 'windows'">win-$(TargetArchitecture)</_outputRID>
143+
<_outputRID Condition="'$(TargetOS)' == 'OSX'">osx-$(TargetArchitecture)</_outputRID>
144+
<_outputRID Condition="'$(TargetOS)' == 'Linux'">linux-$(TargetArchitecture)</_outputRID>
145+
<_outputRID Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(TargetArchitecture)</_outputRID>
146+
<_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture)</_outputRID>
147+
<_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture)</_outputRID>
148+
<_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)</_outputRID>
149+
<_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)</_outputRID>
150+
<_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)</_outputRID>
151+
<_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)</_outputRID>
152+
<_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture)</_outputRID>
153+
154+
<OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
155+
<OutputRid Condition="'$(PortableBuild)' == 'true'">$(_outputRID)</OutputRid>
156+
</PropertyGroup>
157+
158+
<PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">
159+
<TargetsFreeBSD Condition="'$(TargetOS)' == 'FreeBSD'">true</TargetsFreeBSD>
160+
<Targetsillumos Condition="'$(TargetOS)' == 'illumos'">true</Targetsillumos>
161+
<TargetsSolaris Condition="'$(TargetOS)' == 'Solaris'">true</TargetsSolaris>
162+
<TargetsLinux Condition="'$(TargetOS)' == 'Linux' or '$(TargetOS)' == 'Android'">true</TargetsLinux>
163+
<TargetsNetBSD Condition="'$(TargetOS)' == 'NetBSD'">true</TargetsNetBSD>
164+
<TargetsOSX Condition="'$(TargetOS)' == 'OSX'">true</TargetsOSX>
165+
<TargetsiOS Condition="'$(TargetOS)' == 'iOS'">true</TargetsiOS>
166+
<TargetstvOS Condition="'$(TargetOS)' == 'tvOS'">true</TargetstvOS>
167+
<TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">true</TargetsiOSSimulator>
168+
<TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(TargetArchitecture)' == 'x64'">true</TargetstvOSSimulator>
169+
<TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
170+
<TargetsBrowser Condition="'$(TargetOS)' == 'Browser'">true</TargetsBrowser>
171+
<TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>
172+
<TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
173+
</PropertyGroup>
174+
71175
<!--Feature switches -->
72176
<PropertyGroup>
73177
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
@@ -76,4 +180,6 @@
76180
<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
77181
<CheckEolTargetFramework>false</CheckEolTargetFramework>
78182
</PropertyGroup>
183+
184+
<Import Project="$(MSBuildThisFileDirectory)native\naming.props" />
79185
</Project>

‎eng/native/init-distro-rid.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ initNonPortableDistroRid()
119119
#
120120
# __DistroRid
121121
# __PortableBuild
122-
# __RuntimeId
123122
#
124123
initDistroRidGlobal()
125124
{
@@ -194,13 +193,8 @@ initDistroRidGlobal()
194193

195194
if [ -z "$__DistroRid" ]; then
196195
echo "DistroRid is not set. This is almost certainly an error"
197-
198196
exit 1
199-
else
200-
echo "__DistroRid: ${__DistroRid}"
201-
echo "__RuntimeId: ${__DistroRid}"
202-
203-
__RuntimeId="${__DistroRid}"
204-
export __RuntimeId
205197
fi
198+
199+
echo "__DistroRid: ${__DistroRid}"
206200
}

‎eng/native/naming.props

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,54 @@
11
<Project>
2+
<PropertyGroup>
3+
<StaticLibPrefix>lib</StaticLibPrefix>
4+
</PropertyGroup>
5+
26
<!-- Add path globs specific to native binaries to exclude unnecessary files from packages. -->
37
<Choose>
4-
<When Condition=" '$(_runtimeOSFamily)' == 'win' OR $(RuntimeIdentifier.StartsWith('win')) ">
8+
<When Condition="$(PackageRID.StartsWith('win'))">
59
<PropertyGroup>
6-
<ApplicationFileExtension>.exe</ApplicationFileExtension>
7-
<LibraryFilePrefix></LibraryFilePrefix>
8-
<LibraryFileExtension>.dll</LibraryFileExtension>
9-
<StaticLibraryFileExtension>.lib</StaticLibraryFileExtension>
10-
<SymbolFileExtension>.pdb</SymbolFileExtension>
10+
<ExeSuffix>.exe</ExeSuffix>
11+
<LibSuffix>.dll</LibSuffix>
12+
<StaticLibSuffix>.lib</StaticLibSuffix>
13+
<SymbolsSuffix>.pdb</SymbolsSuffix>
1114
</PropertyGroup>
1215
</When>
13-
<When Condition=" '$(_runtimeOSFamily)' == 'osx' or $(RuntimeIdentifier.StartsWith('osx')) or '$(_runtimeOSFamily)' == 'ios' or $(RuntimeIdentifier.StartsWith('ios'))">
16+
<When Condition="$(PackageRID.StartsWith('osx'))">
1417
<PropertyGroup>
15-
<LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
16-
<LibraryFileExtension>.dylib</LibraryFileExtension>
17-
<StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
18-
<SymbolFileExtension>.dwarf</SymbolFileExtension>
18+
<LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix>
19+
<LibSuffix>.dylib</LibSuffix>
20+
<StaticLibSuffix>.a</StaticLibSuffix>
21+
<SymbolsSuffix>.dwarf</SymbolsSuffix>
1922
</PropertyGroup>
2023
</When>
21-
<When Condition=" '$(_runtimeOSFamily)' == 'android' ">
24+
<When Condition="$(PackageRID.StartsWith('android'))">
2225
<PropertyGroup>
23-
<LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
24-
<LibraryFileExtension>.so</LibraryFileExtension>
25-
<StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
26+
<LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix>
27+
<LibSuffix>.so</LibSuffix>
28+
<StaticLibSuffix>.a</StaticLibSuffix>
2629
<!--symbols included in .so, like Linux, but can be generated externally and if so, uses .debug ext-->
27-
<SymbolFileExtension>.debug</SymbolFileExtension>
30+
<SymbolsSuffix>.debug</SymbolsSuffix>
2831
</PropertyGroup>
2932
</When>
3033
<Otherwise>
3134
<PropertyGroup>
32-
<LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
33-
<LibraryFileExtension>.so</LibraryFileExtension>
34-
<StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
35-
<SymbolFileExtension>.dbg</SymbolFileExtension>
35+
<LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix>
36+
<LibSuffix>.so</LibSuffix>
37+
<StaticLibSuffix>.a</StaticLibSuffix>
38+
<SymbolsSuffix>.dbg</SymbolsSuffix>
3639
</PropertyGroup>
3740
</Otherwise>
3841
</Choose>
3942

4043
<ItemGroup>
41-
<AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" />
42-
<AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" />
44+
<AdditionalLibPackageExcludes Condition="'$(SymbolsSuffix)' != ''" Include="%2A%2A\%2A$(SymbolsSuffix)" />
45+
<AdditionalSymbolPackageExcludes Condition="'$(LibSuffix)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibSuffix)" />
4346
</ItemGroup>
4447

48+
<!-- arcade is using long name for this property; 'SymbolFileExtension'.
49+
remove this property group when arcade is updated with short name (SymbolsSuffix). -->
50+
<PropertyGroup>
51+
<SymbolFileExtension>$(SymbolsSuffix)</SymbolFileExtension>
52+
</PropertyGroup>
53+
4554
</Project>

‎src/coreclr/dir.common.props

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,6 @@
5050
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
5151
</PropertyGroup>
5252

53-
<!-- Set up common target properties that we use to conditionally include sources -->
54-
<PropertyGroup>
55-
<TargetsFreeBSD Condition="'$(TargetOS)' == 'FreeBSD'">true</TargetsFreeBSD>
56-
<TargetsLinux Condition="'$(TargetOS)' == 'Linux'">true</TargetsLinux>
57-
<TargetsNetBSD Condition="'$(TargetOS)' == 'NetBSD'">true</TargetsNetBSD>
58-
<Targetsillumos Condition="'$(TargetOS)' == 'illumos'">true</Targetsillumos>
59-
<TargetsSolaris Condition="'$(TargetOS)' == 'Solaris'">true</TargetsSolaris>
60-
<TargetsOSX Condition="'$(TargetOS)' == 'OSX'">true</TargetsOSX>
61-
<TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>
62-
63-
<TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true'">true</TargetsUnix>
64-
65-
<!-- We are only tracking Linux Distributions for Nuget RID mapping -->
66-
<DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid>
67-
</PropertyGroup>
68-
6953
<!-- Set the kind of PDB to Portable -->
7054
<PropertyGroup>
7155
<DebugType Condition="'$(DebugType)' == ''">Portable</DebugType>

0 commit comments

Comments
 (0)