|
| 1 | +diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets |
| 2 | +index 2e9f642b8..1f30c3646 100644 |
| 3 | +--- a/src/redist/targets/GenerateBundledVersions.targets |
| 4 | ++++ b/src/redist/targets/GenerateBundledVersions.targets |
| 5 | +@@ -141,7 +141,7 @@ |
| 6 | + win-x86; |
| 7 | + " /> |
| 8 | + |
| 9 | +- <NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/> |
| 10 | ++ <NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids);freebsd-x64"/> |
| 11 | + |
| 12 | + <Net50AppHostRids Include=" |
| 13 | + @(NetCore31RuntimePackRids); |
| 14 | +@@ -262,7 +262,7 @@ |
| 15 | + linux-arm64; |
| 16 | + " /> |
| 17 | + |
| 18 | +- <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" /> |
| 19 | ++ <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64;freebsd-x64" /> |
| 20 | + |
| 21 | + <Net60Crossgen2SupportedRids Include=" |
| 22 | + @(Net50Crossgen2SupportedRids); |
| 23 | +@@ -298,6 +298,7 @@ |
| 24 | + @(Net70ILCompilerSupportedRids); |
| 25 | + osx-x64; |
| 26 | + osx-arm64; |
| 27 | ++ freebsd-x64; |
| 28 | + " /> |
| 29 | + |
| 30 | + <NativeAOTRuntimePackRids Include=" |
| 31 | +@@ -314,7 +315,7 @@ |
| 32 | + " |
| 33 | + /> |
| 34 | + |
| 35 | +- <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" /> |
| 36 | ++ <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids);freebsd-x64" /> |
| 37 | + <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" /> |
| 38 | + <AspNetCore60RuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x" /> |
| 39 | + <AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" /> |
| 40 | +diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets |
| 41 | +index 6d216ff20..e4494395b 100644 |
| 42 | +--- a/src/redist/targets/GetRuntimeInformation.targets |
| 43 | ++++ b/src/redist/targets/GetRuntimeInformation.targets |
| 44 | +@@ -4,7 +4,7 @@ |
| 45 | + <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRid> |
| 46 | + <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid> |
| 47 | + |
| 48 | +- <IsLinux Condition = " $([MSBuild]::IsOSPlatform('LINUX')) ">True</IsLinux> |
| 49 | ++ <IsLinux Condition = " $([MSBuild]::IsOSPlatform('LINUX')) AND ('$(OSName)' == '' OR '$(OSName)' == 'linux') ">True</IsLinux> |
| 50 | + <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS')) ">win</HostOSName> |
| 51 | + <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName> |
| 52 | + <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName> |
0 commit comments