Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Lapounov <anton.lapounov@microsoft.com>2016-12-07 04:16:13 +0300
committerGitHub <noreply@github.com>2016-12-07 04:16:13 +0300
commit24d694e55e2ab6332219ddc345edb941974e0c5a (patch)
treed38022ba189d7d12183e4949f2a4c08c4f73d653 /src/System.Runtime.Extensions/pkg
parent14e302d77af8506cede016c39fe88c5e5b101e49 (diff)
Build System.Runtime.Extensions and System.Security.Principal packages for uap101aot target. (#13754)
Enable building the System.Runtime.Extensions and System.Security.Principal packages for uap101aot target. Temporarily skip AppDomain.cs—there are several issues with it.
Diffstat (limited to 'src/System.Runtime.Extensions/pkg')
-rw-r--r--src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj3
-rw-r--r--src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
index 1d2f31a196..bd230b2feb 100644
--- a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
+++ b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
@@ -11,6 +11,9 @@
<ProjectReference Include="..\src\System.Runtime.Extensions.csproj">
<TargetGroup>net463</TargetGroup>
</ProjectReference>
+ <ProjectReference Include="..\src\System.Runtime.Extensions.csproj">
+ <TargetGroup>uap101aot</TargetGroup>
+ </ProjectReference>
<ProjectReference Include="win\System.Runtime.Extensions.pkgproj" />
<ProjectReference Include="unix\System.Runtime.Extensions.pkgproj" />
<InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj
index b5e859fe67..fcbcf869b0 100644
--- a/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj
+++ b/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj
@@ -9,6 +9,11 @@
<ProjectReference Include="..\..\src\System.Runtime.Extensions.csproj">
<OSGroup>Windows_NT</OSGroup>
</ProjectReference>
+ <!-- AOT implementation comes from AOT package -->
+ <File Include="$(PlaceholderFile)">
+ <TargetPath>runtimes/aot/lib/uap10.1</TargetPath>
+ <TargetFramework>aot</TargetFramework>
+ </File>
<!-- don't use the dotnet implementation for any version of desktop, it's implementation comes from the reference package -->
<ExternalOnTargetFramework Include="net" />
</ItemGroup>