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

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
external/corefx/src/System.Diagnostics.TraceSource/dir.props vendored
View File

@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<AssemblyKey>MSFT</AssemblyKey>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>

1
external/corefx/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj vendored
View File

@@ -7,7 +7,6 @@
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid>
</PropertyGroup>
<!-- Help VS understand available configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />

1
external/corefx/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceLevel.cs vendored
View File

@@ -11,7 +11,6 @@ namespace System.Diagnostics
/// <para>Specifies what messages to output for debugging
/// and tracing.</para>
/// </devdoc>
[Serializable]
public enum TraceLevel
{
/// <devdoc>

5
external/corefx/src/System.Diagnostics.TraceSource/tests/CorrelationManagerTests.cs vendored
View File

@@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using Xunit;
using System;
using System.Collections;
using System.Diagnostics.Tracing;
using System.Linq;
@@ -34,7 +35,7 @@ namespace System.Diagnostics.TraceSourceTests
[Fact]
public void CorrelationManager_NullOperationId()
{
Assert.Throws<ArgumentNullException>("operationId", () => Trace.CorrelationManager.StartLogicalOperation(null));
AssertExtensions.Throws<ArgumentNullException>("operationId", () => Trace.CorrelationManager.StartLogicalOperation(null));
}
[Fact]
@@ -133,4 +134,4 @@ namespace System.Diagnostics.TraceSourceTests
}
}
}
}
}

3
external/corefx/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj vendored
View File

@@ -31,6 +31,9 @@
<Compile Include="TraceSwitchClassTests.cs" />
<Compile Include="TraceTestHelper.cs" />
<Compile Include="CorrelationManagerTests.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\IO\FileCleanupTestBase.cs">
<Link>Common\System\IO\FileCleanupTestBase.cs</Link>
</Compile>

1
external/corefx/src/System.Diagnostics.TraceSource/tests/TraceEventCacheClassTests.cs vendored
View File

@@ -56,6 +56,7 @@ namespace System.Diagnostics.TraceSourceTests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Stack Traces are not so rich on AoT.")]
public void CallstackTest_ContainsExpectedFrames()
{
var cache = new TraceEventCache();

5
external/corefx/src/System.Diagnostics.TraceSource/tests/TraceSourceClassTests.cs vendored
View File

@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using Xunit;
namespace System.Diagnostics.TraceSourceTests
@@ -124,8 +125,8 @@ namespace System.Diagnostics.TraceSourceTests
[Fact]
public void NullSourceName()
{
Assert.Throws<ArgumentNullException>("name", () => new TraceSource(null));
Assert.Throws<ArgumentNullException>("name", () => new TraceSource(null, SourceLevels.All));
AssertExtensions.Throws<ArgumentNullException>("name", () => new TraceSource(null));
AssertExtensions.Throws<ArgumentNullException>("name", () => new TraceSource(null, SourceLevels.All));
}
[Fact]