Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

NetcoreApp api #11272

Closed
ericstj wants to merge 4 commits into from
Closed

NetcoreApp api #11272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ba152b
Make Interop API additions specific to netcoreapp
ericstj Aug 30, 2016
487ecb5
Remove redist builds for Interop
ericstj Aug 30, 2016
59348d8
Remove redist builds for RegEx
ericstj Aug 30, 2016
58098d3
Make RegEx API additions specific to netcoreapp
ericstj Aug 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,8 +1687,8 @@
"4.0.10.0": "4.0.10",
"4.0.20.0": "4.0.20",
"4.1.0.0": "4.1.0",
"4.2.0.0": "4.2.0",
"4.0.21.0": "4.0.21"
"4.0.21.0": "4.0.21",
"4.1.1.0": "4.3.0"
}
},
"System.Runtime.InteropServices.RuntimeInformation": {
Expand Down Expand Up @@ -2078,7 +2078,7 @@
"4.0.0.0": "4.0.0",
"4.0.10.0": "4.0.10",
"4.1.0.0": "4.0.12",
"4.2.0.0": "4.2.0",
"4.1.1.0": "4.3.0",
"4.0.11.0": "4.0.11",
"4.0.12.0": "4.0.12"
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.2.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
</PropertyGroup>
</Project>

20 changes: 1 addition & 19 deletions src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,8 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\4.0.0\System.Runtime.InteropServices.depproj">
<SupportedFramework>net45;netcore45</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.10\System.Runtime.InteropServices.depproj">
<SupportedFramework>net451;netcore451;wpa81</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.20\System.Runtime.InteropServices.depproj">
<SupportedFramework>net46;netcore50</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.1\System.Runtime.InteropServices.depproj">
<SupportedFramework>net462</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\System.Runtime.InteropServices.csproj">
<SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\redist\System.Runtime.InteropServices.depproj">
<TargetGroup>net462</TargetGroup>
</ProjectReference>
<ProjectReference Include="..\src\System.Runtime.InteropServices.csproj">
<TargetGroup>net463</TargetGroup>
<SupportedFramework>netcoreapp1.1</SupportedFramework>
</ProjectReference>
<ProjectReference Include="any\System.Runtime.InteropServices.pkgproj" />
<ProjectReference Include="aot\System.Runtime.InteropServices.pkgproj" />
Expand Down
9 changes: 0 additions & 9 deletions src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@

<ItemGroup>
<ProjectReference Include="..\..\src\System.Runtime.InteropServices.csproj" />
<ProjectReference Include="..\..\src\redist\System.Runtime.InteropServices.depproj">
<TargetGroup>netcore50</TargetGroup>
</ProjectReference>

<!-- AOT implementation comes from AOT package -->
<File Include="$(PlaceholderFile)">
<TargetPath>runtimes/aot/lib/netcore50</TargetPath>
<TargetFramework>aot</TargetFramework>
</File>

<InboxOnTargetFramework Include="MonoAndroid10" />
<InboxOnTargetFramework Include="MonoTouch10" />
Expand Down
6 changes: 0 additions & 6 deletions src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,5 @@
<PreventImplementationReference>true</PreventImplementationReference>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\redist\System.Runtime.InteropServices.depproj">
<TargetGroup>netcore50aot</TargetGroup>
</ProjectReference>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
14 changes: 0 additions & 14 deletions src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Runtime.InteropServices/ref/4.0.0/project.json
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Runtime.InteropServices/ref/4.0.10/project.json
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Runtime.InteropServices/ref/4.0.20/project.json
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Runtime.InteropServices/ref/4.1/project.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public static void GetNativeVariantForObject<T>(T obj, System.IntPtr pDstNativeV
[System.Security.SecurityCriticalAttribute]
public static string PtrToStringUTF8(System.IntPtr ptr) { return default(string); }
[System.Security.SecurityCriticalAttribute]
public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); }
public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); }
[System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))]
[System.Security.SecurityCriticalAttribute]
public static void PtrToStructure(System.IntPtr ptr, object structure) { }
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NoWarn>618</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Library</OutputType>
<PackageTargetFramework>netstandard1.6</PackageTargetFramework>
<PackageTargetFramework Condition="'$(TargetGroup)' == ''">netcoreapp1.1</PackageTargetFramework>
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
<ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
</PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,10 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Runtime.InteropServices.csproj" />
<Project Include="System.Runtime.InteropServices.csproj">
<TargetGroup>net463</TargetGroup>
</Project>
<!-- NETCore50 must redistribute binaries due to shared library
<Project Include="System.Runtime.InteropServices.csproj">
<TargetGroup>netcore50aot</TargetGroup>
</Project> -->
<Project Include="redist\System.Runtime.InteropServices.depproj">
<TargetGroup>netcore50</TargetGroup>
</Project>
<Project Include="redist\System.Runtime.InteropServices.depproj">
<TargetGroup>netcore50aot</TargetGroup>
</Project>
<Project Include="redist\System.Runtime.InteropServices.depproj">
<TargetGroup>net462</TargetGroup>
</Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
Expand Down
14 changes: 1 addition & 13 deletions src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == ''">
<Compile Include="System\Runtime\InteropServices\ComAwareEventInfo.cs" />
<Compile Include="System\Runtime\InteropServices\HandleCollector.CoreCLR.cs" />
Expand All @@ -33,17 +29,9 @@
<Compile Include="System\Runtime\InteropServices\ComTypes\stgmedium.cs" />
<Compile Include="System\Runtime\InteropServices\ComTypes\tymed.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netcore50aot'">
<ItemGroup>
<TargetingPackReference Include="mscorlib" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<TargetingPackReference Include="System.Core" />
<TargetingPackReference Include="System" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcore50aot'">
<TargetingPackReference Include="System.Private.CoreLib" />
<TargetingPackReference Include="System.Private.Interop" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
</ItemGroup>
Expand Down
19 changes: 0 additions & 19 deletions src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/System.Runtime.InteropServices/src/redist/project.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/System.Text.RegularExpressions/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.2.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
</PropertyGroup>
</Project>

8 changes: 1 addition & 7 deletions src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\4.0.0\System.Text.RegularExpressions.depproj">
<SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.10\System.Text.RegularExpressions.depproj">
<SupportedFramework>net46;netcore50</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
<SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>netcoreapp1.1</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
<InboxOnTargetFramework Include="MonoAndroid10" />
Expand Down
14 changes: 0 additions & 14 deletions src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Text.RegularExpressions/ref/4.0.0/project.json
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/System.Text.RegularExpressions/ref/4.0.10/project.json
View file
Open in desktop

This file was deleted.

Loading