diff options
author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-02-09 23:01:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-09 23:01:49 +0300 |
commit | d1cae3b1e4091073a8a9f19ca8cc8616ee4a365b (patch) | |
tree | 6bd5657e21466849214901b7816a9b64dbb447ef /pkg | |
parent | de00a14d56cdb5c14d52eb608ae14dd54d9fad3d (diff) |
Adding Microsoft.Private.CoreFx.UAP package build (#15964)
Adding Microsoft.Private.CoreFx.UAP package build
Diffstat (limited to 'pkg')
5 files changed, 211 insertions, 0 deletions
diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props b/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props new file mode 100644 index 0000000000..0cee6a5271 --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props @@ -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> + uap-Windows_NT; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds new file mode 100644 index 0000000000..41c0cf6f47 --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <Import Project="$(MSBuildProjectName).props" /> + + <ItemGroup Condition="'$(TargetGroup)'=='uap'"> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <PropertyGroup> + <TraversalBuildDependsOn> + FilterProjects; + $(TraversalBuildDependsOn); + </TraversalBuildDependsOn> + </PropertyGroup> + + <Target Name="FilterProjects"> + <Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/> + + <!-- Only build packages for current RID --> + <ItemGroup> + <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' OR '%(Project.PackageTargetRuntime)' == ''" /> + </ItemGroup> + + <ItemGroup> + <Project Remove="@(Project)" /> + <Project Include="@(_projectsToBuild)" /> + </ItemGroup> + </Target> +</Project>
\ No newline at end of file diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj new file mode 100644 index 0000000000..d81c3eed5c --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <Import Project="$(MSBuildProjectName).props" /> + + <PropertyGroup> + <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> + <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference> + <TargetFrameworkName>uap</TargetFrameworkName> + <TargetFrameworkVersion>10.1</TargetFrameworkVersion> + <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + + <RefBinDir>$(UAPPackageRefPath)</RefBinDir> + <LibBinDir Condition="'$(_bc_TargetGroup)'=='uap'">$(UAPPackageRuntimePath)</LibBinDir> + <LibBinDir Condition="'$(_bc_TargetGroup)'=='uapaot'">$(UAPAOTPackageRuntimePath)</LibBinDir> + + <NETStandardVersion>2.0</NETStandardVersion> + </PropertyGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> + <ProjectReference Include="@(Project)" /> + + <!-- Include refs --> + <RefFile Include="$(RefBinDir)/*.*"> + <TargetPath>ref/$(TargetFramework)</TargetPath> + </RefFile> + <File Include="@(RefFile)" /> + <!-- force a missing file if ref build is absent --> + <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(RefFile)' == ''" /> + + <FilePackageDependency Include="Microsoft.NETCore.Platforms"> + <Version>$(PlatformPackageVersion)</Version> + </FilePackageDependency> + </ItemGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> + <!-- Include lib --> + <LibFile Include="$(LibBinDir)/*.*"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> + </LibFile> + <File Include="@(LibFile)" /> + <!-- force a missing file if lib build is absent --> + <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(LibFile)' == ''" /> + + <!-- Include native --> + <ExcludeNative Include="$(NativeBinDir)/*.lib" /> + <NativeFile Include="$(NativeBinDir)/*.*" Exclude="@(ExcludeNative)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </NativeFile> + <File Include="@(NativeFile)" /> + <!-- force a missing file if native build is absent --> + <File Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" /> + </ItemGroup> + + <ItemGroup> + <IgnoredReference Include="System.Private.CoreLib" /> + <IgnoredReference Include="Windows" /> + <IgnoredReference Include="System.Private.Interop" /> + <IgnoredReference Include="Microsoft.Win32.Registry" /> <!-- Ignore for now since it's being exclude from closure below. Issue https://github.com/dotnet/corefx/issues/15966 --> + <IgnoredReference Include="System.IO.IsolatedStorage" /> <!-- Ignore for now since it's being exclude from closure below. Issue https://github.com/dotnet/corefx/issues/15968 --> + </ItemGroup> + + <Target Name="VerifyClosure" AfterTargets="Build"> + <ItemGroup> + <ExcludeFromClosure Include="System.IO.IsolatedStorage" /> <!-- IsolatedStorage depends on AccessControl which is not available for UAP --> + <ExcludeFromClosure Include="Microsoft.Win32.Registry" /> <!-- Most likely this one will be removed from the package, it's just there today for the closure --> + <!-- Exclude shims from the closure verification --> + <ExcludeFromClosure Include="mscorlib" /> + <ExcludeFromClosure Include="System" /> + <ExcludeFromClosure Include="System.Core" /> + <ExcludeFromClosure Include="System.Data" /> + </ItemGroup> + + <ItemGroup> + <_fileExisting Include="@(File)" Condition="Exists(%(FullPath))"/> + + <_fileNames Include="@(_fileExisting -> '%(FileName)')" Exclude="@(ExcludeFromClosure)"> + <Original>%(_fileExisting.Identity)</Original> + </_fileNames> + <_filesFiltered Include="@(_fileNames->'%(Original)')" /> + </ItemGroup> + + <VerifyClosure Sources="@(_filesFiltered)" + IgnoredReferences="@(IgnoredReference)" /> + </Target> + + <Target Name="VerifyNETStandard" AfterTargets="Build"> + <ItemGroup> + <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\ref\netstandard$(NETStandardVersion)\*.dll" /> + <_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(File->'%(FileName)')" /> + <_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" /> + <_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" /> + </ItemGroup> + <Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardPackageId)' but missing from this package. This error has been suppressed." /> + <Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardPackageId)' but missing from this package." /> + </Target> + + <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles"> + <ItemGroup> + <File> + <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> + <IsSymbolFile Condition="'$(SymbolFileExtension)' != '' AND'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile> + </File> + </ItemGroup> + </Target> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.props b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.props new file mode 100644 index 0000000000..e43620cb2f --- /dev/null +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.props @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <PropertyGroup> + <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> + <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily> + </PropertyGroup> + + <Choose> + <When Condition="'$(PackageRID)' != ''" /> + <When Condition="'$(_runtimeOSFamily)' == 'win'"> + <PropertyGroup> + <PackageRID Condition="'$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64'">win7-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(ArchGroup)' == 'arm'">win8-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(ArchGroup)' == 'arm64'">win10-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID> + </PropertyGroup> + </Otherwise> + </Choose> + + <ItemGroup> + <OfficialBuildRID Include="win7-x86"> + <Platform>x86</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="win7-x64" /> + <OfficialBuildRID Include="win8-arm"> + <Platform>arm</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="win10-arm64"> + <Platform>arm64</Platform> + </OfficialBuildRID> + + <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set --> + <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/> + <BuildRID Include="$(PackageRID)"> + <Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform> + <Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform> + </BuildRID> + </ItemGroup> + + <ItemGroup> + <_project Include="@(BuildRID)"> + <Platform Condition="'%(Platform)' == ''">amd64</Platform> + <PackageTargetRuntime>%(Identity)</PackageTargetRuntime> + <AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties> + </_project> + + <Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/pkg/descriptions.json b/pkg/descriptions.json index e94f0b2c09..bb48e9b530 100644 --- a/pkg/descriptions.json +++ b/pkg/descriptions.json @@ -116,6 +116,11 @@ "CommonTypes": [] }, { + "Name": "Microsoft.Private.CoreFx.UAP", + "Description": "Package used to represent the portions of UAP that come from CoreFx.", + "CommonTypes": [] + }, + { "Name": "Microsoft.TargetingPack.NETFramework.v4.6", "Description": "Contains the .NET Framework v4.6 targeting pack.", "CommonTypes": [] |