You've already forked linux-packaging-mono
Imported Upstream version 5.16.0.100
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
0a9828183b
commit
7d7f676260
@@ -26,6 +26,7 @@ ROSLYN_FILES_FOR_MONO = \
|
||||
ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.Build.Tasks.CodeAnalysis.dll \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.Managed.Core.targets \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets
|
||||
|
||||
ROSLYN_DIM_FILES = $(topdir)/../external/roslyn-binaries/Prototypes/DefaultInterfaceImplementation/*
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
f05efc1a893862b0f114a0a76620b8661272148a
|
||||
Binary file not shown.
@@ -1 +0,0 @@
|
||||
2ad58e695999acab255b43212777276fccf98b8a
|
||||
@@ -1 +0,0 @@
|
||||
b21fcbe9336c57e668847b417c21995036af1b62
|
||||
@@ -1 +0,0 @@
|
||||
a3985f27509c583bdab4fbd2e12b931c96885f1d
|
||||
@@ -1 +0,0 @@
|
||||
270574d390a3ea048cafc086660206e2e9d17ab0
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
3bf3618690e6ca33330d856383b96b29eb508c97
|
||||
@@ -1,17 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies"
|
||||
BeforeTargets="CoreCompile"
|
||||
Condition="'@(ReferencePathWithRefAssemblies)' == ''">
|
||||
<!-- Common targets should populate this item from dev15.3, but this file
|
||||
may be used (via NuGet package) on earlier MSBuilds. If the
|
||||
adjusted-for-reference-assemblies item is not populated, just use
|
||||
the older item's contents. -->
|
||||
<ItemGroup>
|
||||
<ReferencePathWithRefAssemblies Include="@(ReferencePath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
<Import Project="Microsoft.Managed.Core.targets"/>
|
||||
|
||||
<Target Name="CoreCompile"
|
||||
Inputs="$(MSBuildAllProjects);
|
||||
@@ -36,7 +26,7 @@
|
||||
$(NonExistentFile);
|
||||
@(CustomAdditionalCompileOutputs)"
|
||||
Returns="@(CscCommandLineArgs)"
|
||||
DependsOnTargets="$(CoreCompileDependsOn)">
|
||||
DependsOnTargets="$(CoreCompileDependsOn);_BeforeVBCSCoreCompile">
|
||||
<!-- These two compiler warnings are raised when a reference is bound to a different version
|
||||
than specified in the assembly reference version number. MSBuild raises the same warning in this case,
|
||||
so the compiler warning would be redundant. -->
|
||||
@@ -49,12 +39,6 @@
|
||||
<NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' > '10.0'">$(NoWarn);2008</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
|
||||
<ReferencePathWithRefAssemblies>
|
||||
<EmbedInteropTypes />
|
||||
</ReferencePathWithRefAssemblies>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
|
||||
then we'll use AppConfig -->
|
||||
@@ -64,22 +48,6 @@
|
||||
<PdbFile Condition="'$(PdbFile)' == '' AND '$(OutputType)' == 'winmdobj' AND '$(_DebugSymbolsProduced)' == 'true'">$(IntermediateOutputPath)$(TargetName).compile.pdb</PdbFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
|
||||
<PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
|
||||
https://github.com/dotnet/roslyn/issues/12223 -->
|
||||
<ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
|
||||
<AdditionalFileItems Include="$(AdditionalFileItemNames)" />
|
||||
<AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
|
||||
<UseSharedCompilation>true</UseSharedCompilation>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
|
||||
<Csc Condition="'%(_CoreCompileResourceInputs.WithCulture)' != 'true'"
|
||||
AdditionalLibPaths="$(AdditionalLibPaths)"
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
5bc2c361c871cbbf70f443ff21bfd2baa9bacfe2
|
||||
@@ -0,0 +1 @@
|
||||
9532a7fe99f81bf979e696480c8b23c3c33a9856
|
||||
@@ -0,0 +1 @@
|
||||
95276b83555d48139fbe45e62e101feddee50f19
|
||||
@@ -0,0 +1 @@
|
||||
24009d33c4582463dc2903aa4e8985a0ebbec416
|
||||
@@ -0,0 +1,147 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!--
|
||||
Common targets for managed compilers.
|
||||
-->
|
||||
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.MapSourceRoots" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Build.Tasks.CodeAnalysis.dll" />
|
||||
|
||||
<Target Name="ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies"
|
||||
BeforeTargets="CoreCompile"
|
||||
Condition="'@(ReferencePathWithRefAssemblies)' == ''">
|
||||
<!-- Common targets should populate this item from dev15.3, but this file
|
||||
may be used (via NuGet package) on earlier MSBuilds. If the
|
||||
adjusted-for-reference-assemblies item is not populated, just use
|
||||
the older item's contents. -->
|
||||
<ItemGroup>
|
||||
<ReferencePathWithRefAssemblies Include="@(ReferencePath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_BeforeVBCSCoreCompile">
|
||||
<ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
|
||||
<ReferencePathWithRefAssemblies>
|
||||
<EmbedInteropTypes />
|
||||
</ReferencePathWithRefAssemblies>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
|
||||
<PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
|
||||
https://github.com/dotnet/roslyn/issues/12223 -->
|
||||
<ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
|
||||
<AdditionalFileItems Include="$(AdditionalFileItemNames)" />
|
||||
<AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
|
||||
<UseSharedCompilation>true</UseSharedCompilation>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
========================
|
||||
DeterministicSourcePaths
|
||||
========================
|
||||
|
||||
Unless specified otherwise enable deterministic source root (PathMap) when building deterministically on CI server, but not for local builds.
|
||||
In order for the debugger to find source files when debugging a locally built binary the PDB must contain original, unmapped local paths.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<DeterministicSourcePaths Condition="'$(DeterministicSourcePaths)' == '' and '$(Deterministic)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true'">true</DeterministicSourcePaths>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
==========
|
||||
SourceRoot
|
||||
==========
|
||||
|
||||
All source files of the project are expected to be located under one of the directories specified by SourceRoot item group.
|
||||
This target collects all SourceRoots from various sources.
|
||||
|
||||
This target calculates final local path for each SourceRoot and sets SourceRoot.MappedPath metadata accordingly.
|
||||
The final path is a path with deterministic prefix when DeterministicSourcePaths is true, and the original path otherwise.
|
||||
In addition, the target validates and deduplicates the SourceRoot items.
|
||||
|
||||
InitializeSourceControlInformation is an msbuild target that ensures the SourceRoot items are populated from source control.
|
||||
The target is available only if SourceControlInformationFeatureSupported is true.
|
||||
|
||||
A consumer of SourceRoot.MappedPath metadata, such as Source Link generator, shall depend on this target.
|
||||
-->
|
||||
|
||||
<Target Name="InitializeSourceRootMappedPaths"
|
||||
DependsOnTargets="_InitializeSourceRootMappedPathsFromSourceControl">
|
||||
|
||||
<ItemGroup Condition="'@(_MappedSourceRoot)' != ''">
|
||||
<_MappedSourceRoot Remove="@(_MappedSourceRoot)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Microsoft.CodeAnalysis.BuildTasks.MapSourceRoots SourceRoots="@(SourceRoot)" Deterministic="$(DeterministicSourcePaths)">
|
||||
<Output TaskParameter="MappedSourceRoots" ItemName="_MappedSourceRoot" />
|
||||
</Microsoft.CodeAnalysis.BuildTasks.MapSourceRoots>
|
||||
|
||||
<ItemGroup>
|
||||
<SourceRoot Remove="@(SourceRoot)" />
|
||||
<SourceRoot Include="@(_MappedSourceRoot)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Declare that target InitializeSourceRootMappedPaths that populates MappedPaths metadata on SourceRoot items is available.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<SourceRootMappedPathsFeatureSupported>true</SourceRootMappedPathsFeatureSupported>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
If InitializeSourceControlInformation target isn't supported, we just continue without invoking that synchronization target.
|
||||
We'll proceed with SourceRoot (and other source control properties) provided by the user (or blank).
|
||||
-->
|
||||
<Target Name="_InitializeSourceRootMappedPathsFromSourceControl"
|
||||
DependsOnTargets="InitializeSourceControlInformation"
|
||||
Condition="'$(SourceControlInformationFeatureSupported)' == 'true'" />
|
||||
|
||||
<!--
|
||||
=======
|
||||
PathMap
|
||||
=======
|
||||
|
||||
If DeterministicSourcePaths is true sets PathMap based on SourceRoot.MappedPaths.
|
||||
|
||||
This target requires SourceRoot to be initialized in order to calculate the PathMap.
|
||||
If SourceRoot doesn't contain any top-level roots an error is reported.
|
||||
-->
|
||||
|
||||
<Target Name="_SetPathMapFromSourceRoots"
|
||||
DependsOnTargets="InitializeSourceRootMappedPaths"
|
||||
BeforeTargets="CoreCompile"
|
||||
Condition="'$(DeterministicSourcePaths)' == 'true'">
|
||||
|
||||
<ItemGroup>
|
||||
<_TopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition="'@(_TopLevelSourceRoot)' != ''">
|
||||
<!-- TODO: Report error/warning if /pathmap doesn't cover all emitted source paths: https://github.com/dotnet/roslyn/issues/23969 -->
|
||||
|
||||
<!-- TODO: PathMap should accept and ignore empty mapping: https://github.com/dotnet/roslyn/issues/23523 -->
|
||||
<PathMap Condition="'$(PathMap)' != ''">,$(PathMap)</PathMap>
|
||||
|
||||
<!--
|
||||
Prepend the SourceRoot.MappedPath values to PathMap, if it already has a value.
|
||||
For each emitted source path the compiler applies the first mapping that matches the path.
|
||||
PathMap values set previously will thus only be applied if the mapping provided by
|
||||
SourceRoot.MappedPath doesn't match. Since SourceRoot.MappedPath is also used by SourceLink
|
||||
preferring it over manually set PathMap ensures that PathMap is consistent with SourceLink.
|
||||
|
||||
TODO: quote the paths to avoid misinterpreting ',' and '=' in them as separators,
|
||||
but quoting doesn't currently work (see https://github.com/dotnet/roslyn/issues/22835).
|
||||
-->
|
||||
<PathMap>@(_TopLevelSourceRoot->'%(Identity)=%(MappedPath)', ',')$(PathMap)</PathMap>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
@@ -1,17 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies"
|
||||
BeforeTargets="CoreCompile"
|
||||
Condition="'@(ReferencePathWithRefAssemblies)' == ''">
|
||||
<!-- Common targets should populate this item from dev15.3, but this file
|
||||
may be used (via NuGet package) on earlier MSBuilds. If the
|
||||
adjusted-for-reference-assemblies item is not populated, just use
|
||||
the older item's contents. -->
|
||||
<ItemGroup>
|
||||
<ReferencePathWithRefAssemblies Include="@(ReferencePath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
<Import Project="Microsoft.Managed.Core.targets"/>
|
||||
|
||||
<Target Name="CoreCompile"
|
||||
Inputs="$(MSBuildAllProjects);
|
||||
@@ -36,7 +26,7 @@
|
||||
$(NonExistentFile);
|
||||
@(CustomAdditionalCompileOutputs)"
|
||||
Returns="@(VbcCommandLineArgs)"
|
||||
DependsOnTargets="$(CoreCompileDependsOn)">
|
||||
DependsOnTargets="$(CoreCompileDependsOn);_BeforeVBCSCoreCompile">
|
||||
<PropertyGroup>
|
||||
<_NoWarnings Condition="'$(WarningLevel)' == '0'">true</_NoWarnings>
|
||||
<_NoWarnings Condition="'$(WarningLevel)' == '1'">false</_NoWarnings>
|
||||
@@ -47,28 +37,6 @@
|
||||
<PdbFile Condition="'$(PdbFile)' == '' AND '$(OutputType)' == 'winmdobj' AND '$(DebugSymbols)' == 'true'">$(IntermediateOutputPath)$(TargetName).compile.pdb</PdbFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
|
||||
<ReferencePathWithRefAssemblies>
|
||||
<EmbedInteropTypes />
|
||||
</ReferencePathWithRefAssemblies>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
|
||||
<PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
|
||||
https://github.com/dotnet/roslyn/issues/12223 -->
|
||||
<ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
|
||||
<AdditionalFileItems Include="$(AdditionalFileItemNames)" />
|
||||
<AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
|
||||
<UseSharedCompilation>true</UseSharedCompilation>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
|
||||
<Vbc Condition="'%(_CoreCompileResourceInputs.WithCulture)' != 'true'"
|
||||
AdditionalLibPaths="$(AdditionalLibPaths)"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user