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

18
external/corefx/src/System.Transactions.Local/src/System/Transactions/Transaction.cs vendored
View File

@@ -1236,7 +1236,7 @@ namespace System.Transactions
internal bool _asyncFlow;
[ThreadStatic]
private static ContextData s_staticData;
private static ContextData t_staticData;
internal ContextData(bool asyncFlow)
{
@@ -1247,28 +1247,28 @@ namespace System.Transactions
{
get
{
ContextData data = s_staticData;
ContextData data = t_staticData;
if (data == null)
{
data = new ContextData(false);
s_staticData = data;
t_staticData = data;
}
return data;
}
set
{
if (value == null && s_staticData != null)
if (value == null && t_staticData != null)
{
// set each property to null to retain one TLS ContextData copy.
s_staticData.CurrentScope = null;
s_staticData.CurrentTransaction = null;
s_staticData.DefaultComContextState = DefaultComContextState.Unknown;
s_staticData.WeakDefaultComContext = null;
t_staticData.CurrentScope = null;
t_staticData.CurrentTransaction = null;
t_staticData.DefaultComContextState = DefaultComContextState.Unknown;
t_staticData.WeakDefaultComContext = null;
}
else
{
s_staticData = value;
t_staticData = value;
}
}
}

3
external/corefx/src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj vendored
View File

@@ -18,9 +18,6 @@
<Compile Include="HelperFunctions.cs" />
<Compile Include="TestEnlistments.cs" />
<Compile Include="TransactionTracingEventListener.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />

2
external/corefx/src/System.Transactions.Local/tests/TransactionScopeTest.cs vendored
View File

@@ -999,7 +999,7 @@ namespace System.Transactions.Tests
[Fact]
public void ExplicitTransaction12()
{
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("asyncResult", () =>
{
CommittableTransaction ct = new CommittableTransaction();