mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
external/corefx/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props vendored
View File

@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(PortableBuild)' == 'true'">
<PackageRID>linux-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(_runtimeOSFamily)' == 'osx'">osx-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(_runtimeOSFamily)' == 'win'">win-$(ArchGroup)</PackageRID>
</PropertyGroup>
<PropertyGroup Condition="'$(PortableBuild)' != 'true'">
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>
<ItemGroup>
<OfficialBuildRID Include="linux-arm">
<Platform>arm</Platform>

2
external/corefx/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj vendored
View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<TargetFrameworkName>uap</TargetFrameworkName>
<TargetFrameworkVersion>10.1</TargetFrameworkVersion>
<TargetFrameworkVersion>$(UAPvNextVersion)</TargetFrameworkVersion>
<TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
<RefBinDir>$(UAPPackageRefPath)</RefBinDir>

18
external/corefx/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props vendored
View File

@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_aotSuffix Condition="'$(TargetGroup)' == 'uapaot'">-aot</_aotSuffix>
</PropertyGroup>
<Choose>
<When Condition="'$(PackageRID)' != ''" />
<When Condition="'$(_runtimeOSFamily)' == 'win'">
<PropertyGroup>
<PackageRID>win10-$(ArchGroup)$(_aotSuffix)</PackageRID>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
<OfficialBuildRID Include="win10-x86">
<Platform>x86</Platform>

2
external/corefx/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj vendored
View File

@@ -34,7 +34,7 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
</FrameworkLayout>
<FrameworkLayout Include="$(UAPPackageRefPath)">
<TargetFramework>uap10.1</TargetFramework>
<TargetFramework>$(UAPvNextTFM)</TargetFramework>
</FrameworkLayout>
<FrameworkLayout Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\netstandard2.0\ref">
<TargetFramework>netstandard2.0</TargetFramework>

2
external/corefx/pkg/Microsoft.Private.PackageBaseline/packageIndex.json.REMOVED.git-id vendored
View File

@@ -1 +1 @@
43d797ce5bb8ecd3987a6df6088ed1002cdaa5fc
a11ac2ff955dec38fa844ef93c18de3dbe4e0fec

41
external/corefx/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj vendored
View File

@@ -13,12 +13,12 @@
<IsFrameworkPackage>true</IsFrameworkPackage>
<IncludeLibFiles>true</IncludeLibFiles>
<!-- ValidatePackage doesn't evaluate our targets/props so it does
<!-- ValidatePackage doesn't evaluate our targets/props so it does
not find any of the assets in this package -->
<SkipValidatePackage>true</SkipValidatePackage>
</PropertyGroup>
<ItemGroup>
<StampFile Include="targets\NETStandard.Library.NETFramework.common.props">
<TargetPath>build</TargetPath>
@@ -71,7 +71,7 @@
<StampedFile>$(IntermediateOutputPath)%(StampFile.RelativeDir)%(StampFile.FileName)%(StampFile.Extension)</StampedFile>
</StampFile>
</ItemGroup>
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(StampFile.StampedFile)'))" />
<!-- Update targets templates -->
<WriteLinesToFile
@@ -83,7 +83,7 @@
<File Include="@(StampFile->'%(StampedFile)')" />
</ItemGroup>
</Target>
<Target Name="AddNETStandardLibraryReference" AfterTargets="ApplyBaselineToStaticDependencies">
<ItemGroup>
<!-- ApplyBaseline doesn't handle NuGet versions, so workaround that by
@@ -96,7 +96,30 @@
</ItemGroup>
</Target>
<Target Name="ExpandClosureFilesByTargetFramework"
<Target Name="AddFrameworkClosureFiles" AfterTargets="ExpandClosureFilesByTargetFramework">
<ItemGroup>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)netfx/%(Identity).dll')" >
<FileSet>reference-net461</FileSet>
</FrameworkClosureFile>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)netfx/%(Identity).dll')" >
<FileSet>runtime-net461</FileSet>
</FrameworkClosureFile>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net462/%(Identity).dll')" >
<FileSet>reference-net462</FileSet>
</FrameworkClosureFile>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net462/%(Identity).dll')" >
<FileSet>runtime-net462</FileSet>
</FrameworkClosureFile>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net47/%(Identity).dll')" >
<FileSet>reference-net47</FileSet>
</FrameworkClosureFile>
<FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net47/%(Identity).dll')" >
<FileSet>runtime-net47</FileSet>
</FrameworkClosureFile>
</ItemGroup>
</Target>
<Target Name="ExpandClosureFilesByTargetFramework"
AfterTargets="GetClosureFiles"
Inputs="%(ClosureFile.FileSet)"
Outputs="batching-on-Closure-metadata">
@@ -123,7 +146,7 @@
<ClosureFile Include="@(_closureFileNet462->'%(Original)')">
<FileSet>%(FileSet)-net462</FileSet>
</ClosureFile>
<ClosureFile Include="@(_closureFileNet47->'%(Original)')" >
<FileSet>%(FileSet)-net47</FileSet>
</ClosureFile>
@@ -132,7 +155,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<!-- runs as initial target, overrides IncludeFiles in frameworkPackage.targets to define TFM-specific TargetPath
<!-- runs as initial target, overrides IncludeFiles in frameworkPackage.targets to define TFM-specific TargetPath
under the build folder -->
<Target Name="IncludeFiles" DependsOnTargets="IncludeNETStandardShims">
<PropertyGroup>
@@ -144,7 +167,7 @@
<File Include="@(RefFile)">
<TargetPath Condition="'%(RefFile.TargetPath)' == ''">build/%(RefFile.TargetFramework)/ref%(RefFile.SubFolder)</TargetPath>
</File>
<!-- Include lib -->
<File Include="@(LibFile)">
<TargetPath Condition="'%(LibFile.TargetPath)' == '' ">build/%(LibFile.TargetFramework)/lib%(LibFile.SubFolder)</TargetPath>

5
external/corefx/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets vendored
View File

@@ -1,4 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ImportedNETStandardLibraryNETFrameworkCommonTargets>true</ImportedNETStandardLibraryNETFrameworkCommonTargets>
</PropertyGroup>
<Choose>
<!-- Allow completely disabling the conflict resolution targets-->
<When Condition="'$(ImplicitlyExpandNETStandardFacades)' != 'true'" />
@@ -28,7 +31,7 @@
<!-- Ensure this runs before conflict resolution since the added files may cause conflicts -->
<HandlePackageFileConflictsDependsOn>ImplicitlyExpandNETStandardFacades;$(HandlePackageFileConflictsDependsOn)</HandlePackageFileConflictsDependsOn>
</PropertyGroup>
<ItemGroup Condition="'$(DontTrimNETStandardLibraryNETFramework)' != 'true'">
<!-- mark this package as trimmable so that files in the same package aren't automatically rooted -->
<TrimmablePackages Include="NETStandard.Library.NETFramework" />

10
external/corefx/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets vendored
View File

@@ -1,11 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'">
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
</ItemGroup>
<Import Project="..\$(MSBuildThisFileName).common.targets" />
<Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" />
</Project>

10
external/corefx/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets vendored
View File

@@ -1,12 +1,12 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'">
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
</ItemGroup>
<Import Project="..\net461\$(MSBuildThisFile)" />
<Import Project="..\$(MSBuildThisFileName).common.targets" />
<Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" />
</Project>

10
external/corefx/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets vendored
View File

@@ -1,12 +1,12 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'">
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll'" />
<_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" />
</ItemGroup>
<Import Project="..\net462\$(MSBuildThisFile)" />
<Import Project="..\$(MSBuildThisFileName).common.targets" />
<Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" />
</Project>

11
external/corefx/pkg/dir.props vendored
View File

@@ -2,20 +2,13 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
</PropertyGroup>
<!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project
that defines the following:
PackageRID property: the RID which we should be building for
OfficialBuildRID item: all RIDs targeted by the package -->
that defines the OfficialBuildRID item: all RIDs targeted by the package -->
<Import Project="$(MSBuildProjectDirectory)\*.rids.props" />
<!-- create the "BuildRID" item which is the set of all supported RIDs, with metadata.
We'll add a RID for the current platform even if it isn't in the officially supported set -->
<ItemGroup>
<ItemGroup Condition="'@(OfficialBuildRID)' != ''">
<BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
<BuildRID Include="$(PackageRID)">
<Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform>

25
external/corefx/pkg/frameworkPackage.targets vendored
View File

@@ -17,6 +17,7 @@
<LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' AND '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</LibFileTargetPath>
<NativeFileTargetPath Condition="'$(NativeFileTargetPath)' == '' AND '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/native</NativeFileTargetPath>
<NativeBinDir Condition="'$(PackageTargetRuntimeSuffix)' == 'aot'">$(NativeBinDir)_aot</NativeBinDir>
</PropertyGroup>
<!-- Bring in ref content from binplaced ref props -->
@@ -53,7 +54,7 @@
<!-- force a missing file if native build is absent -->
<NativeFile Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" />
</ItemGroup>
<Target Name="_CheckForFiles">
<Error Condition="'$(IncludeReferenceFiles)' == 'true' AND '@(RefFile)' == ''"
Text="IncludeReferenceFiles was specified but no file props were found in '$(RefBinDir)'" />
@@ -62,7 +63,7 @@
<Error Condition="'$(IncludeNativeFiles)' == 'true' AND '@(NativeFile)' == ''"
Text="IncludeNativeFiles was specified but no files were found in '$(NativeBinDir)'" />
</Target>
<Target Name="IncludeFiles">
<PropertyGroup>
<_projectDirLength>$(ProjectDir.Length)</_projectDirLength>
@@ -73,7 +74,7 @@
<File Include="@(RefFile)">
<TargetPath Condition="'%(RefFile.TargetPath)' == ''">$(RefFileTargetPath)%(RefFile.SubFolder)</TargetPath>
</File>
<!-- Include lib -->
<File Include="@(LibFile)">
<TargetPath Condition="'%(LibFile.TargetPath)' == '' ">$(LibFileTargetPath)%(LibFile.SubFolder)</TargetPath>
@@ -106,8 +107,8 @@
</ItemGroup>
</Target>
<Target Name="VerifyClosure"
DependsOnTargets="GetClosureFiles"
<Target Name="VerifyClosure"
DependsOnTargets="GetClosureFiles"
AfterTargets="Build"
Inputs="%(ClosureFile.FileSet)"
Outputs="batching-on-FileSet-metadata">
@@ -126,15 +127,21 @@
</Target>
<Target Name="VerifyDuplicateTypes"
DependsOnTargets="GetClosureFiles"
<Target Name="VerifyDuplicateTypes"
DependsOnTargets="GetClosureFiles"
AfterTargets="Build"
Inputs="%(ClosureFile.FileSet)"
Outputs="batching-on-FileSet-metadata">
<PropertyGroup>
<_fileSet>%(ClosureFile.FileSet)</_fileSet>
</PropertyGroup>
<ItemGroup>
<_dupTypeFileName Include="@(ClosureFile->'%(FileName)')">
<Original>%(Identity)</Original>
</_dupTypeFileName>
<_dupTypeFileName Include="@(FrameworkClosureFile->'%(FileName)')" Exclude="@(_dupTypeFileName)" Condition="'$(_fileSet)' == '%(FrameworkClosureFile.FileSet)'">
<Original>%(Identity)</Original>
</_dupTypeFileName>
<_dupTypeFileNamesFiltered Include="@(_dupTypeFileName)" Exclude="@(ExcludeFromDuplicateTypes)"/>
<_dupTypeFileFiltered Include="@(_dupTypeFileNamesFiltered->'%(Original)')"/>
</ItemGroup>
@@ -145,8 +152,8 @@
</Target>
<Target Name="VerifyNETStandard"
DependsOnTargets="GetClosureFiles"
<Target Name="VerifyNETStandard"
DependsOnTargets="GetClosureFiles"
AfterTargets="Build"
Inputs="%(ClosureFile.FileSet)"
Outputs="batching-on-FileSet-metadata">