diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-01-04 03:27:18 +0300 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-01-04 03:31:00 +0300 |
| commit | da25ec6df3b9475ae35dd6e989ab91429e73c099 (patch) | |
| tree | 57aa707e1bdd69bd5e1593be23bc46e1779582b6 /src/System.Diagnostics.Debug | |
| parent | 412e9292bdbe9715a753db655189323ba0d05192 (diff) | |
Change how test references are resolved.
* When NoTargetingPackReferences is set to 'true', then no references are
added to any assemblies in the targeting pack.
* Names in the RuntimeReferencedAssemblyNames item group are now used to
add items into the ReferencePath group. Absolute paths of runtime
assemblies are added to the list, and AssemblySearchPaths is no longer
modified at all when runtime assemblies are referenced.
* Fix up System.Diagnostics.Debug.Tests and System.Linq.Expressions.Tests
based on the above changes. Linq.Expressions.Tests no longer references
its own src project, which should fix some race conditions in the build.
Diffstat (limited to 'src/System.Diagnostics.Debug')
| -rw-r--r-- | src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 9984b62732..cc69725e31 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -9,7 +9,6 @@ <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> <NoWarn>1685</NoWarn> <NoTargetingPackReferences>true</NoTargetingPackReferences> - <WindowsAppContainer>false</WindowsAppContainer> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -17,16 +16,16 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Private.CoreLib" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <RuntimeReferencedAssemblyNames Include="System.Diagnostics.Debug" /> + <RuntimeReferencedAssemblyNames Include="System.Runtime" /> + <RuntimeReferencedAssemblyNames Include="System.Runtime.Extensions" /> + <RuntimeReferencedAssemblyNames Include="System.Private.CoreLib" /> + <RuntimeReferencedAssemblyNames Include="System.Threading.Tasks" /> + <RuntimeReferencedAssemblyNames Include="System.Runtime.InteropServices.RuntimeInformation" /> </ItemGroup> <ItemGroup> <Compile Include="AttributeTests.cs" /> - <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'==''"/> + <Compile Include="DebuggerTests.cs" Condition="'$(TargetGroup)'=='netstandard1.7'"/> <Compile Include="DebugTests.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> |