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:
authorTarek Mahmoud Sayed <tarekms@microsoft.com>2016-08-29 19:57:26 +0300
committerTarek Mahmoud Sayed <tarekms@microsoft.com>2016-08-29 19:57:26 +0300
commit27ed033f3f3b2ad6b19db98db00c8789aed74a1b (patch)
treef44bfe49b1c5a6779baa9856f1c84e2448d3761d /src/System.Globalization.Calendars/pkg
parent56067a34dc0fa32bac35040630dc3058a297f4ca (diff)
Move the Globalization and Encoding contracts to System.Runtime
This change is to add the globalization and encoding to System.Runtime and update System.Globalization.* and System.Text.Encoding contarcts too just type forward instead of having any implementation
Diffstat (limited to 'src/System.Globalization.Calendars/pkg')
-rw-r--r--src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj4
-rw-r--r--src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj3
-rw-r--r--src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj5
3 files changed, 2 insertions, 10 deletions
diff --git a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
index 61e4e634e0..58a8b0a67d 100644
--- a/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
+++ b/src/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
@@ -3,10 +3,10 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Globalization.Calendars.csproj">
- <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+ <SupportedFramework>netcoreapp1.1;net463;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Globalization.Calendars.csproj">
- <TargetGroup>net46</TargetGroup>
+ <TargetGroup>net463</TargetGroup>
</ProjectReference>
<ProjectReference Include="any\System.Globalization.Calendars.pkgproj" />
<ProjectReference Include="aot\System.Globalization.Calendars.pkgproj" />
diff --git a/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj
index 04f217085b..85a05597f9 100644
--- a/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj
+++ b/src/System.Globalization.Calendars/pkg/any/System.Globalization.Calendars.pkgproj
@@ -8,9 +8,6 @@
<ItemGroup>
<ProjectReference Include="..\..\src\System.Globalization.Calendars.csproj" />
- <ProjectReference Include="..\..\src\System.Globalization.Calendars.csproj">
- <TargetGroup>netcore50</TargetGroup>
- </ProjectReference>
<!-- desktop facade is in the ref package -->
<ExternalOnTargetFramework Include="net"/>
diff --git a/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj b/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
index 556f6866f7..737121495e 100644
--- a/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
+++ b/src/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
@@ -7,11 +7,6 @@
<PreventImplementationReference>true</PreventImplementationReference>
</PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\src\System.Globalization.Calendars.csproj">
- <TargetGroup>netcore50aot</TargetGroup>
- </ProjectReference>
- </ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project> \ No newline at end of file