diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-07-16 03:10:42 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-07-16 03:10:42 +0300 |
| commit | 797f074e49933b5fffb42d1a945270f3a88de042 (patch) | |
| tree | 49f171cc5e7edba5adf6cfee4e9512aef11774c8 /src/System.Transactions.Local | |
| parent | 7e70a4e9236104c350e7d9ca3505225755065569 (diff) | |
| parent | c8e2d532ecb97ac4021c382578be2d385d7b3219 (diff) | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/Microsoft.Win32.Primitives/src/System/ComponentModel/Win32Exception.cs
# src/System.ComponentModel.TypeConverter/src/System/ComponentModel/BindingList.cs
# src/System.DirectoryServices/src/System/DirectoryServices/DirectoryServicesCOMException.cs
# src/System.ObjectModel/src/System/Collections/ObjectModel/ObservableCollection.cs
# src/System.ObjectModel/src/System/Collections/ObjectModel/ReadOnlyObservableCollection.cs
Diffstat (limited to 'src/System.Transactions.Local')
| -rw-r--r-- | src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj b/src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj index abba6dd7cf..097521406a 100644 --- a/src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj +++ b/src/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj @@ -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" /> |