Build for netfx current & suppress a test on mono

dotnet · Mar 20, 2020 · b05e788 · b05e788
1 parent 0ebe7fa
commit b05e788
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...rosoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/...rosoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
 
     <ILEmitBackend Condition="$(TargetFramework) != 'netstandard2.0'">True</ILEmitBackend>
     <DefineConstants Condition="'$(ILEmitBackend)' == 'True'">$(DefineConstants);IL_EMIT</DefineConstants>

diff --git a/src/mono/netcore/CoreFX.issues_linux.rsp b/src/mono/netcore/CoreFX.issues_linux.rsp
@@ -21,6 +21,9 @@
 # StackOverflow somewhere here
 -nonamespace System.Threading.Tasks.Tests
 
+# Stack overflow, might need tuning or reduce stack space used compared to CoreCLR
+-nomethod  Microsoft.Extensions.DependencyInjection.Tests.ServiceProviderCompilationTest.CompilesInLimitedStackSpace
+
 # Requires precise GC (should be ignored in dotnet/corefx for mono)
 -nomethod System.Collections.Concurrent.Tests.ConcurrentQueueTests.ReferenceTypes_NulledAfterDequeue
 -nomethod System.Threading.Tests.ThreadLocalTests.RunThreadLocalTest7_WeakReference