diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-09-19 15:19:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 15:19:22 +0300 |
| commit | efd29b5cf854679349066e22ef9038b8cfe76d94 (patch) | |
| tree | 2de750c1ac8a487d7f6d149592a6362ade6a5a77 /src/Framework/Framework.depproj | |
| parent | f9124d69e41d42196510dd7234b2d53fed48ad4c (diff) | |
| parent | 49f9ed0e66fc2d4cd682821396c6af5e80182048 (diff) | |
Merge pull request #25 from ntherning/bump-corert
Bump to latest upstream
Diffstat (limited to 'src/Framework/Framework.depproj')
| -rw-r--r-- | src/Framework/Framework.depproj | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/Framework/Framework.depproj b/src/Framework/Framework.depproj index e994ff425..d72b2e1a0 100644 --- a/src/Framework/Framework.depproj +++ b/src/Framework/Framework.depproj @@ -5,8 +5,8 @@ </PropertyGroup> <PropertyGroup> - <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker> - <TargetFramework>netcoreapp2.1</TargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker> + <TargetFramework>netcoreapp3.0</TargetFramework> <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> @@ -29,22 +29,30 @@ </ItemGroup> <ItemGroup> + <!-- System.Runtime.InteropServices implementation has to be forwarded to System.Private.Interop --> + <!-- TODO https://github.com/dotnet/corert/issues/3231 --> + <FileToExclude Include="System.Runtime.InteropServices" /> + <FileToExclude Include="mscorlib" /> + <!-- Pickup a few selected aot-specific files from uapaot instead --> <FileToExclude Include="System.Linq.Expressions" /> - <FileToExclude Include="System.Reflection.Primitives" /> - <FileToExclude Include="System.Runtime.InteropServices" /> <FileToExclude Include="System.Text.RegularExpressions" /> + <FileToExclude Include="System.Private.Xml" /> + <FileToExclude Include="System.Private.Xml.Linq" /> <!-- TODO: Upstack framework --> <FileToExclude Include="System.Private.DataContractSerialization" /> - <FileToExclude Include="System.Private.Xml" /> <FileToExclude Include="System.Reflection.DispatchProxy" /> - <FileToExclude Include="System.Private.Xml.Linq" /> <FileToExclude Include="System.Data.Common" /> <FileToExclude Include="System.Diagnostics.StackTrace" /> - <!-- TODO: Unmanaged --> - <FileToExclude Include="clrcompression" /> + <!-- TODO: WinRT --> + <FileToExclude Include="System.Runtime.InteropServices.WindowsRuntime" /> + <FileToExclude Include="System.Runtime.WindowsRuntime" /> + <FileToExclude Include="System.Runtime.WindowsRuntime.UI.Xaml" /> + + <!-- TODO: https://github.com/dotnet/corert/issues/5496 --> + <!-- <FileToExclude Include="clrcompression" /> --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> |