Imported Upstream version 6.6.0.144

Former-commit-id: 335a70f3c58a7479968dcaae1d3412c2da9f9a3a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-10-25 09:01:16 +00:00
parent 85bcceff8c
commit 790c4870fc
245 changed files with 629 additions and 257 deletions

View File

@@ -1 +1 @@
9c77e0fd0018e3a4328e0e3f0f167ee53b8b9ca5
bd5802af7c3f4bd7c01fbcc60f2a93213c20d5f3

View File

@@ -3,8 +3,8 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Microsoft.Managed.Core.targets"/>
<PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(TargetFrameworkVersion)' != 'v3.0') AND
('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(TargetFrameworkVersion)' != 'v2.1')">
<PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(_TargetFrameworkVersionWithoutV)' &lt; '3.0') AND
('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(_TargetFrameworkVersionWithoutV)' &lt; '2.1')">
<MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion>
<LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
</PropertyGroup>

View File

@@ -1 +1 @@
98fa7406778f8dbfde086154f17ec8f1754a6261
282d58a6250a9638c4b645fc35acec89b5da9d1f

View File

@@ -1 +1 @@
db091085345128e9fc42238e03e5e72b296fef55
50cd17bee38ed0b30fb18a1b2807366fb25d47ee

View File

@@ -1 +1 @@
4f1824c7c9d77dd2bf072c2f1ed0c2393a80a4de
73e77c620d2f02401c2b04f632afab8301813e2a

View File

@@ -1 +1 @@
99d862a2aef02f42e0405ab0b63e09a05bb255a5
f19a88d78b7db406c51b4105d4668cf6ac575a9d

View File

@@ -55,12 +55,14 @@
.editorconfig Support
========================
The discovery of .editorconfig files depends on MSBuild features only available in version 16.1 and later. To avoid evaluation errors when
running under earlier versions of MSBuild we place the relevant properties and imports in a separate .targets file.
TODO: Inline the import when we no longer need to support earlier versions of MSBuild.
-->
<Import Project="Microsoft.Managed.EditorConfig.targets" Condition="$(MSBuildVersion) >= 16.1.0" />
<ItemGroup>
<_AllDirectoriesAbove Include="@(Compile->GetPathsOfAllDirectoriesAbove())" Condition="'$(DiscoverEditorConfigFiles)' != 'false'" />
<!-- Work around a GetPathsOfAllDirectoriesAbove() bug where it can return multiple equivalent paths when the
compilation includes linked files with relative paths - https://github.com/microsoft/msbuild/issues/4392 -->
<PotentialEditorConfigFiles Include="@(_AllDirectoriesAbove->'%(FullPath)'->Distinct()->Combine('.editorconfig'))" Condition="'$(DiscoverEditorConfigFiles)' != 'false'" />
<EditorConfigFiles Include="@(PotentialEditorConfigFiles->Exists())" Condition="'$(DiscoverEditorConfigFiles)' != 'false'" />
</ItemGroup>
<!--
========================

View File

@@ -2,10 +2,10 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<configuration>
<startup>
<AppContextSwitchOverrides value="Switch.System.Security.Cryptography.UseLegacyFipsThrow=false" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<runtime>
<AppContextSwitchOverrides value="Switch.System.Security.Cryptography.UseLegacyFipsThrow=false" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />