VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-10 10:00:57 +09:00
Code Activity

Updating the package index for UAP and updating buildtools (dotnet/corefx#27787)

Browse source 
* Updating the package index for UAP and updating buildtools

* Having System.Reflection.DispatchProxy crosscompile for uap RS3

* Updating buildtools and fixing PR feedback

* Re-add support for uap to the assemblies that already had a netcoreapp2.0 config for Windows


Commit migrated from 7be44d2de8
This commit is contained in:
Jose Perez Rodriguez 2018-03-08 09:43:06 -08:00 • committed by GitHub
parent 891e8a71b4
commit 2b978b922f
45 changed files with 1298 additions and 1084 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libraries/BuildToolsVersion.txt
View file

@ -1 +1 @@
2.1.0-preview2-02528-07
2.1.0-preview2-02606-05

2
src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj
View file

@ -6,12 +6,10 @@
<ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
<AllowReferenceFromRuntime>true</AllowReferenceFromRuntime>
<RuntimeProjectFile>$(ProjectDir)\external\test-runtime\XUnit.Runtime.depproj</RuntimeProjectFile>
<PackageTargetFramework>netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" />
<Compile Include="CoreFx.Private.TestUtilities.cs" />
<ReferenceFromRuntime Include="xunit.core" />
</ItemGroup>

2
src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
View file

@ -19,7 +19,7 @@
<AsFrameworkReference>true</AsFrameworkReference>
</InboxOnTargetFramework>
<InboxOnTargetFramework Include="netcoreapp2.0" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="win8" />
<InboxOnTargetFramework Include="wp80" />
<InboxOnTargetFramework Include="wpa81" />

2
src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
View file

@ -13,7 +13,7 @@
<HarvestIncludePaths Include="ref/netstandard1.1" />
<HarvestIncludePaths Include="lib/netstandard1.3" />
<InboxOnTargetFramework Include="netcoreapp2.0" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="win8" />
<InboxOnTargetFramework Include="wpa81" />
<InboxOnTargetFramework Include="portable-net45+win8+wpa81" />

2
src/libraries/Microsoft.Win32.Registry/src/Configurations.props
View file

@ -2,8 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PackageConfigurations>
netstandard-Windows_NT;
netstandard;
netcoreapp2.0-Windows_NT;
netcoreapp2.0-Unix;
netfx-Windows_NT;
</PackageConfigurations>

6
src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
View file

@ -8,7 +8,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true' AND '$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
<!--
Temporarily necessary as this is only being built for UWP due to an unwanted dependency on it
https://github.com/dotnet/corefx/issues/15966
@ -27,7 +27,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) OR ('$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true')">
<Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
<Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
</Compile>
@ -44,7 +44,7 @@
<Compile Include="System\Security\AccessControl\RegistryRights.cs" />
<Compile Include="System\Security\AccessControl\RegistrySecurity.cs" />
</ItemGroup>
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) AND '$(TargetsWindows)' == 'true'">
<ItemGroup Condition="($(TargetGroup.StartsWith('netcoreapp')) OR '$(TargetGroup)' == 'netstandard') AND '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>

2
src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\Microsoft.Win32.SystemEvents.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" />
</ItemGroup>

2
src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
View file

@ -16,7 +16,7 @@
<FrameworkReference>System.ComponentModel.DataAnnotations</FrameworkReference>
</InboxOnTargetFramework>
<InboxOnTargetFramework Include="netcoreapp2.0" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="win8" />
<InboxOnTargetFramework Include="portable-net45+win8" />
<InboxOnTargetFramework Include="xamarinios10" />

3
src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj
View file

@ -3,12 +3,13 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.ComponentModel.Composition.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.ComponentModel.Composition.csproj" />
<InboxOnTargetFramework Include="net45">
<AsFrameworkReference>true</AsFrameworkReference>
</InboxOnTargetFramework>
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

3
src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
View file

@ -3,8 +3,6 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}</ProjectGuid>
<!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref -->
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
@ -12,7 +10,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" />
<Compile Include="System.Configuration.cs" />
</ItemGroup>
<ItemGroup>

2
src/libraries/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Data.DataSetExtensions.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.DataSetExtensions.csproj" />
<InboxOnTargetFramework Include="net45">

2
src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Data.Odbc.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.Odbc.csproj" />
</ItemGroup>

4
src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
View file

@ -6,9 +6,9 @@
<SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.SqlClient.csproj" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
</File>
<HarvestIncludePaths Include="ref/net451;lib/net451;runtimes/win/lib/net451" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />

2
src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Diagnostics.EventLog.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Diagnostics.EventLog.csproj" />
</ItemGroup>

2
src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Diagnostics.PerformanceCounter.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Diagnostics.PerformanceCounter.csproj" />
</ItemGroup>

2
src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.DirectoryServices.AccountManagement.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.DirectoryServices.AccountManagement.csproj" />
<InboxOnTargetFramework Include="net45">

2
src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.DirectoryServices.Protocols.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.DirectoryServices.Protocols.csproj" />

2
src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.DirectoryServices.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.DirectoryServices.csproj" />

2
src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Drawing.Common.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Drawing.Common.csproj" />

2
src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
View file

@ -3,8 +3,8 @@
<PropertyGroup>
<PackageConfigurations>
netstandard;
netstandard-Windows_NT;
netfx-Windows_NT;
netcoreapp2.0-Windows_NT;
</PackageConfigurations>
<BuildConfigurations>
$(PackageConfigurations);

10
src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
View file

@ -7,19 +7,19 @@
<PropertyGroup>
<AssemblyName>System.IO.FileSystem.AccessControl</AssemblyName>
<ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid>
<AllowUnsafeBlocks Condition="$(TargetGroup.StartsWith('netcoreapp'))">true</AllowUnsafeBlocks>
<AllowUnsafeBlocks Condition="'$(TargetsWindows)' == 'true'">true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)'!='netfx'">
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
<Link>Common\Interop\Windows\Interop.Errors.cs</Link>
</Compile>

5
src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj
View file

@ -7,8 +7,6 @@
<AssemblyName>System.IO.Packaging</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
<!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref -->
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework>
<DefineConstants Condition="'$(TargetGroup)' != 'netstandard1.3'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" />
@ -19,9 +17,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
<SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3'">
<Reference Include="System.Collections" />
<Reference Include="System.Diagnostics.Debug" />

4
src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
View file

@ -6,9 +6,9 @@
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks);$(UAPvNextTFM)</SupportedFramework>
</ProjectReference>
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
</File>
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<ProjectReference Include="..\src\System.IO.Ports.csproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

2
src/libraries/System.Management/pkg/System.Management.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Management.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Management.csproj" />
<InboxOnTargetFramework Include="net45">

2
src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.WebSockets.WebSocketProtocol.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Net.WebSockets.WebSocketProtocol.csproj" />
</ItemGroup>

2
src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
View file

@ -5,6 +5,8 @@
netfx;
netstandard;
netcoreapp2.0;
uap10.0.16299-Windows_NT;
uap10.0.16299aot-Windows_NT;
uapaot-Windows_NT;
uap-Windows_NT;
</PackageConfigurations>

10
src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
View file

@ -5,10 +5,10 @@
<ProjectGuid>{1E689C1B-690C-4799-BDE9-6E7990585894}</ProjectGuid>
<AssemblyName>System.Reflection.DispatchProxy</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'uapaot'">true</IsPartialFacadeAssembly>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'uapaot' OR '$(TargetGroup)' == 'uap10.0.16299aot'">true</IsPartialFacadeAssembly>
<!-- this library depends on Ref.Emit which is not available for netstandard -->
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_ReflectionDispatchProxy</GeneratePlatformNotSupportedAssemblyMessage>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'uapaot'">None</ResourcesSourceOutputDirectory>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'uapaot' OR '$(TargetGroup)' == 'uap10.0.16299aot'">None</ResourcesSourceOutputDirectory>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
@ -22,6 +22,10 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap10.0.16299-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap10.0.16299-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap10.0.16299aot-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap10.0.16299aot-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetGroup)' != 'netstandard'">
<Compile Include="System\Reflection\DispatchProxy.cs" />
<Compile Include="System\Reflection\DispatchProxyGenerator.cs" />
@ -31,7 +35,7 @@
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot' OR '$(TargetGroup)' == 'uap10.0.16299aot'">
<ReferenceFromRuntime Include="System.Private.Interop" />
<ReferenceFromRuntime Include="System.Private.CoreLib" />
</ItemGroup>

4
src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
View file

@ -17,9 +17,9 @@
</ItemGroup>
<ItemGroup>
<InboxOnTargetFramework Include="netcoreapp2.0" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<File Include="$(PlaceholderFile)">
<TargetPath>runtimes/aot/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/aot/lib/uap10.0.16299</TargetPath>
</File>
<InboxOnTargetFramework Include="MonoAndroid10" />
<InboxOnTargetFramework Include="MonoTouch10" />

2
src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Runtime.Caching.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Runtime.Caching.csproj" />
<InboxOnTargetFramework Include="net45">

4
src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
View file

@ -6,9 +6,9 @@
<SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
</File>
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<ProjectReference Include="..\src\System.Security.AccessControl.csproj" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="ref/netstandard1.3">

4
src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
View file

@ -8,9 +8,9 @@
</ProjectReference>
<ProjectReference Include="..\src\System.Security.Cryptography.Cng.csproj" />
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
</File>
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
<!-- All elements from previous packages that will be included in the newly built package -->
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />

4
src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
View file

@ -7,9 +7,9 @@
</ProjectReference>
<ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" />
<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
<TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
</File>
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="ref/netstandard1.3;runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
<!-- this package is part of the implementation closure of NETStandard.Library

2
src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.ServiceModel.Syndication.csproj">
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.ServiceModel.Syndication.csproj" />
</ItemGroup>

2
src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
View file

@ -3,7 +3,7 @@
<PropertyGroup>
<PackageConfigurations>
netstandard;
netcoreapp2.0-Windows_NT;
netstandard-Windows_NT;
netfx-Windows_NT;
</PackageConfigurations>
<BuildConfigurations>

6
src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
View file

@ -8,7 +8,7 @@
<ProjectGuid>{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}</ProjectGuid>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_ServiceController</GeneratePlatformNotSupportedAssemblyMessage>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_ServiceController</GeneratePlatformNotSupportedAssemblyMessage>
<!-- Although we have a netstandard configuration, we know we are not currently UAP compatible-->
<UWPCompatible>false</UWPCompatible>
</PropertyGroup>
@ -20,7 +20,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) OR ('$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true')">
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
@ -105,7 +105,7 @@
<Reference Include="mscorlib" />
<Reference Include="System.ServiceProcess" />
</ItemGroup>
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) OR ('$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true')">
<Reference Include="Microsoft.Win32.Primitives" />
<Reference Include="System.Collections" />
<Reference Include="System.Console" />

2
src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
View file

@ -8,7 +8,7 @@
<ProjectReference Include="..\src\System.ValueTuple.csproj" />
<InboxOnTargetFramework Include="netstandard2.0" />
<InboxOnTargetFramework Include="netcoreapp2.0" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

6
src/libraries/dependencies.props
View file

@ -17,7 +17,7 @@
<ProjectNTfsTestILCCurrentRef>b58d6cbd6e991edbdbb32aa38a053ae2e0441155</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>6298244e25cf84d91e3cda9627315f2425274624</StandardCurrentRef>
<BuildToolsCurrentRef>553f30357d08df4ed6d32f70f3478a76f5db79c2</BuildToolsCurrentRef>
<BuildToolsCurrentRef>0167b3a44f6dda941b2a3a07b77934a58347f7de</BuildToolsCurrentRef>
</PropertyGroup>
<!-- Product dependency versions. -->
@ -48,13 +48,13 @@
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0018</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
<XunitNetcoreExtensionsVersion>2.1.0-preview2-02528-07</XunitNetcoreExtensionsVersion>
<XunitNetcoreExtensionsVersion>2.1.0-preview2-02606-05</XunitNetcoreExtensionsVersion>
</PropertyGroup>
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<FeedTasksPackageVersion>2.1.0-preview2-02528-07</FeedTasksPackageVersion>
<FeedTasksPackageVersion>2.1.0-preview2-02606-05</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Package dependency verification/auto-upgrade configuration. -->

1
src/libraries/external/dir.proj vendored
View file

@ -8,6 +8,7 @@
<!-- Build for all configurations -->
<ItemGroup>
<Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
<Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="uap/uap.depproj" />
<Project Include="netstandard/netstandard.depproj" />
<Project Include="netfx/netfx.depproj" />
<Project Include="runtime/runtime.depproj" />

1
src/libraries/external/runtime/Configurations.props vendored
View file

@ -6,6 +6,7 @@
netcoreapp-Unix;
netcoreapp2.0-Windows_NT;
netcoreapp2.0-Unix;
uap10.0.16299aot;
uap;
uapaot;
mono;

6
src/libraries/external/runtime/runtime.depproj vendored
View file

@ -7,7 +7,7 @@
<CoreClrPackageVersion Condition="'$(TargetGroup)' == 'netcoreapp2.0'">2.0.0</CoreClrPackageVersion>
<NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot' Or '$(TargetGroup)' == 'uap10.0.16299aot'">
<!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker -->
<NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker>
<NuGetTargetMonikerShort>uap10.1</NuGetTargetMonikerShort>
@ -15,7 +15,7 @@
<BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
<NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
</PropertyGroup>
<ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
<ItemGroup Condition="'$(TargetGroup)'=='uapaot' Or '$(TargetGroup)' == 'uap10.0.16299aot'">
<PackageReference Include="Microsoft.TargetingPack.Private.NETNative">
<Version>1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
</PackageReference>
@ -24,7 +24,7 @@
<FileToExclude Include="System.Private.CoreLib.WinRTInterop" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'!='uapaot'">
<ItemGroup Condition="'$(TargetGroup)'!='uapaot' And '$(TargetGroup)' != 'uap10.0.16299aot'">
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version>
</PackageReference>

8
src/libraries/external/uap/Configurations.props vendored Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
uap10.0.16299;
</BuildConfigurations>
</PropertyGroup>
</Project>

39
src/libraries/external/uap/uap.depproj vendored Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<!-- This project restores and publishes the targeting pack for specific versions of UAP.
With this, we are able to compile assemblies against shipped, stable versions of UAP. -->
<PropertyGroup>
<BinPlaceRef>true</BinPlaceRef>
<NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
<UAPPackageVersion>6.0.7</UAPPackageVersion>
<TargetFramework>uap10.0.16299</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>$(UAPPackageVersion)</Version>
</PackageReference>
<!-- System.Reflection.Emit and System.Reflection.Emit.ILGeneration are needed for the closure of the implementation of System.Reflection.DispatchProxy.
Because they are only available on the implementation, they won't be restored as part of the targeting pack, so adding package references to those
as well. -->
<PackageReference Include="System.Reflection.Emit">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit.ILGeneration">
<Version>4.3.0</Version>
</PackageReference>
<PackageToInclude Include="Microsoft.NETCore.UniversalWindowsPlatform" />
<PackageToInclude Include="System.Reflection.Emit" />
<PackageToInclude Include="System.Reflection.Emit.ILGeneration" />
</ItemGroup>
<ItemGroup>
<!-- for all configurations this project provides refs for that configuration -->
<BinPlaceConfiguration Include="$(Configuration)">
<RefPath>$(RefPath)</RefPath>
</BinPlaceConfiguration>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

2
src/libraries/pkg/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.pkgproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\..\src\CoreFx.Private.TestUtilities\ref\CoreFx.Private.TestUtilities.csproj">
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks);$(UAPvNextTFM)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\..\src\CoreFx.Private.TestUtilities\src\CoreFx.Private.TestUtilities.csproj"/>
</ItemGroup>

2187
src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file

File diff suppressed because it is too large Load diff

19
tools-local/targetgroups.props
View file

@ -17,19 +17,34 @@
<Imports>netcore50</Imports>
<CompatibleWith>netstandard1.4</CompatibleWith>
</TargetGroups>
<TargetGroups Include="uap10.0.16299aot">
<PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
<NuGetTargetMoniker>UAP,Version=v10.0.16299</NuGetTargetMoniker>
<NuGetTargetMonikerShort>uap10.0.16299</NuGetTargetMonikerShort>
<UWPCompatible>true</UWPCompatible>
<Imports>netcore50aot</Imports>
<CompatibleWith>uap10.0.16299;netstandard</CompatibleWith>
</TargetGroups>
<TargetGroups Include="uap10.0.16299">
<NuGetTargetMoniker>UAP,Version=v10.0.16299</NuGetTargetMoniker>
<NuGetTargetMonikerShort>uap10.0.16299</NuGetTargetMonikerShort>
<UWPCompatible>true</UWPCompatible>
<Imports>netcore50</Imports>
<CompatibleWith>netstandard</CompatibleWith>
</TargetGroups>
<TargetGroups Include="uapvnextaot">
<PackageTargetRuntimeSuffix>aot</PackageTargetRuntimeSuffix>
<NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort>
<UWPCompatible>true</UWPCompatible>
<Imports>netcore50aot</Imports>
<Imports>uap10.0.16299aot</Imports>
<CompatibleWith>uapvnext;netstandard2.0</CompatibleWith>
</TargetGroups>
<TargetGroups Include="uapvnext">
<NuGetTargetMoniker>$(UAPvNextTFMFull)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(UAPvNextTFM)</NuGetTargetMonikerShort>
<UWPCompatible>true</UWPCompatible>
<Imports>netcore50</Imports>
<Imports>uap10.0.16299</Imports>
<CompatibleWith>netstandard2.0</CompatibleWith>
</TargetGroups>
<!-- uap is an alias for uapvNext any/coreclr runtime -->