Merge branch 'system.runtime.internal' of github.com:jkoritzinsky/run…

…time into system.runtime.internal
dotnet · Nov 17, 2021 · 1cd5be6 · 1cd5be6
2 parents f233d76 + 64d30cf
commit 1cd5be6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libraries/System.Runtime.Internal/Directory.Build.targets b/src/libraries/System.Runtime.Internal/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 
-  <Target Name="DisallowPacking" BeforeTargets="Pack">
+  <Target Name="DisallowPacking" BeforeTargets="Pack" Condition="'$(IsPackable)' == 'true'">
     <Error Text="System.Runtime.Internal should never be shipped outside of this repository so building a NuGet package for it is blocked as there is no use case for a NuGet package of an entirely repo-local assembly." />
   </Target>
 

diff --git a/src/tests/Interop/COM/Activator/Program.cs b/src/tests/Interop/COM/Activator/Program.cs
@@ -16,7 +16,7 @@ namespace Activator
     [ComVisible(false)]
     [Guid("00000001-0000-0000-C000-000000000046")]
     [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    public interface IClassFactory
+    interface IClassFactory
     {
         void CreateInstance(
             [MarshalAs(UnmanagedType.Interface)] object pUnkOuter,