diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-01-04 23:09:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-04 23:09:28 +0300 |
| commit | e203014d4b20089402355847ba9482776a29d9d5 (patch) | |
| tree | df43e32d167fad9bdfc64a82ec73ad23ce304399 /src | |
| parent | 547cdd33281dbf7fa7c7eb1ca2686b178e3ec7eb (diff) | |
| parent | 1c2798af71cea94415c147265d53c6db305e6b62 (diff) | |
Merge pull request #14834 from mellinoe/change-test-references
Change how test references are resolved.
Diffstat (limited to 'src')
| -rw-r--r-- | src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj | 15 | ||||
| -rw-r--r-- | src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj | 2 |
2 files changed, 8 insertions, 9 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..43115a46c9 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" /> + <ReferenceFromRuntime Include="System.Diagnostics.Debug" /> + <ReferenceFromRuntime Include="System.Runtime" /> + <ReferenceFromRuntime Include="System.Runtime.Extensions" /> + <ReferenceFromRuntime Include="System.Private.CoreLib" /> + <ReferenceFromRuntime Include="System.Threading.Tasks" /> + <ReferenceFromRuntime 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> diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 4f9900a112..bc69a4c2b0 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -16,7 +16,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <TargetingPackExclusions Include="System.Linq.Expressions" /> - <ProjectReference Include="..\src\System.Linq.Expressions.csproj" /> + <ReferenceFromRuntime Include="System.Linq.Expressions" /> </ItemGroup> <ItemGroup> |