Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kuhne <jeremy.kuhne@microsoft.com>2017-06-29 07:15:33 +0300
committerGitHub <noreply@github.com>2017-06-29 07:15:33 +0300
commit94b2a85c837a536096af1a7bc3812feef45e9ecb (patch)
treeed62c7185fbc4261d08fb93281cef19f3159dc95 /referenceFromRuntime.targets
parentf1cd785e7610a8d7498fba25a01fc35ed22a07d0 (diff)
Add converter from IEnumerable to TheoryData (#21671)
* Add converter from IEnumerable to TheoryData Manipulating test input data in IEnumerable format is desirable, but a bit awkward to get into IEnumerable<object[]> format that [Theory] expects. Add test project to new test project. :) Change a test in System.IO.FileSystem to theory with new extension. * Fix performance test project * Run the UpdateConfigurations target * Add netfx reference
Diffstat (limited to 'referenceFromRuntime.targets')
-rw-r--r--referenceFromRuntime.targets4
1 files changed, 2 insertions, 2 deletions
diff --git a/referenceFromRuntime.targets b/referenceFromRuntime.targets
index 05aaf3f10a..9a736e4bd7 100644
--- a/referenceFromRuntime.targets
+++ b/referenceFromRuntime.targets
@@ -12,8 +12,8 @@
<Target Name="AddRuntimeProjectReference"
BeforeTargets="AddProjectReferencesDynamically"
Condition="'$(IsTestProject)'!='true' AND '@(ReferenceFromRuntime)' != ''">
- <Error Condition="'$(IsReferenceAssembly)' != 'true' AND '$(RuntimeProjectFile)' == ''" Text="RuntimeProjectFile must be specified when using ReferenceFromRuntime from source projects." />
- <Error Condition="'$(IsReferenceAssembly)' == 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." />
+ <Error Condition="('$(IsReferenceAssembly)' != 'true' OR '$(AllowReferenceFromRuntime)' == 'true') AND '$(RuntimeProjectFile)' == ''" Text="RuntimeProjectFile must be specified when using ReferenceFromRuntime from source projects." />
+ <Error Condition="'$(IsReferenceAssembly)' == 'true' AND '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." />
<ItemGroup>
<ProjectReference Include="$(RuntimeProjectFile)">