[master] Update dependencies from dotnet/core-setup (dotnet/corefx#35713)
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Tue, 5 Mar 2019 19:17:12 +0000 (19:17 +0000)
committerGitHub <noreply@github.com>
Tue, 5 Mar 2019 19:17:12 +0000 (19:17 +0000)
* Update dependencies from https://github.com/dotnet/core-setup build 20190301.13

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview4-27501-13
- Microsoft.NETCore.DotNetHost - 3.0.0-preview4-27501-13
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview4-27501-13

* Remove workaround for System.Runtime.CompilerServices.Unsafe

* Update dependencies from https://github.com/dotnet/core-setup build 20190302.8

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview4-27502-8
- Microsoft.NETCore.DotNetHost - 3.0.0-preview4-27502-8
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview4-27502-8

* Update dependencies from https://github.com/dotnet/core-setup build 20190303.9

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview4-27503-9
- Microsoft.NETCore.DotNetHost - 3.0.0-preview4-27503-9
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview4-27503-9

* Update dependencies from https://github.com/dotnet/core-setup build 20190304.10

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview4-27504-10
- Microsoft.NETCore.DotNetHost - 3.0.0-preview4-27504-10
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview4-27504-10

* Don't include EventRegistrationToken on Unix

This type was accidentally duplicated between CoreLib and contracts.

Suppress that for now since we're detecting the duplication in the shared framework.

Make a fix in the shared items to restore the condition on this type.

Commit migrated from https://github.com/dotnet/corefx/commit/ae1426803f77356a7bed0b14c505c8b6030b3a6e

src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets

index 9a0c2d3..b7df991 100644 (file)
@@ -5,12 +5,10 @@
     <!-- use the most recent MS.NETCore.App we have from upstack -->
     <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- unsafe is part of the framework but we don't yet have a MicrosoftNETCoreAppPackageVersion with that change -->
-    <IgnoredReference Include="System.Runtime.CompilerServices.Unsafe"/>
+  <!-- Unix CoreLib contains EventRegistrationToken but no other
+       types from System.Runtime.InteropServices.WindowsRuntime.
+       https://github.com/dotnet/corefx/issues/35792 -->
+  <ItemGroup Condition="'$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('win'))">
+    <IgnoredTypes Include="System.Runtime.InteropServices.WindowsRuntime.EventRegistrationToken" />
   </ItemGroup>
-  <Target Name="CheckForWorkaroundRemoval" AfterTargets="ResolveReferences">
-    <Error Condition="'%(Reference.FileName)' == 'System.Runtime.CompilerServices.Unsafe' AND '%(Reference.NuGetPackageId)' == 'Microsoft.NETCore.App'"
-           Text="Please remove IgnoredReference workaround from pkg\test\frameworkSettings\netcoreapp3.0\settings.targets" />
-  </Target>
 </Project>