diff options
Diffstat (limited to 'src/.nuget/Microsoft.NETCore.Runtime.CoreCLR')
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds | 4 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index 39ace1a582..f4b5e18bf9 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -23,6 +23,10 @@ <OSGroup>Windows_NT</OSGroup> <Platform>x86</Platform> </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 634af4fdc9..0af50e1776 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -5,12 +5,14 @@ <Version>1.1.0</Version> <SkipPackageFileCheck>true</SkipPackageFileCheck> <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> <OutputPath>$(PackagesOutputPath)</OutputPath> <IncludeRuntimeJson>true</IncludeRuntimeJson> </PropertyGroup> <ItemGroup> - <!-- Declare a runtime dependency on the win8-arm CoreCLR built using the TFS builds --> + <!-- ARM32_TODO: Clean this up. + Declare a runtime dependency on the win8-arm CoreCLR built using the TFS builds + --> <RuntimeDependency Include="runtime.win8-arm.Microsoft.NETCore.Runtime.CoreCLR"> <TargetRuntime>win8-arm</TargetRuntime> <Version>1.1.0-$(ExternalExpectedPrerelease)</Version> @@ -30,6 +32,9 @@ <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>x86</Platform> </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> |