Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update dependencies from dotnet/core-setup#35217

Merged
safern merged 3 commits into
masterfrom
darc-master-059be939-a178-4d39-a8e6-66062064f92d
Feb 12, 2019
Merged

Update dependencies from dotnet/core-setup#35217
safern merged 3 commits into
masterfrom
darc-master-059be939-a178-4d39-a8e6-66062064f92d

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Feb 10, 2019

This pull request updates the following dependencies

Updates from https://github.com/dotnet/core-setup

  • Microsoft.NETCore.App - 3.0.0-preview-27410-1
  • Microsoft.NETCore.DotNetHost - 3.0.0-preview-27410-1
  • Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview-27410-1

Updates from https://github.com/dotnet/core-setup

  • Microsoft.NETCore.App - 3.0.0-preview-27410-5
  • Microsoft.NETCore.DotNetHost - 3.0.0-preview-27410-5
  • Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview-27410-5

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Feb 10, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • All Checks Successful Unsuccessful checks: OSX x64 Debug Build, Packaging All Configurations x64 Debug Build, corefx-ci (Packaging All Configurations x64_Debug)

@safern
Copy link
Copy Markdown
Member

safern commented Feb 11, 2019

It look like the latest netcoreapp package has EventCounter defined in System.Private.CoreLib and in System.Diagnostics.Tracing -- I guess this type was pushed down to System.Private.CoreLib, are we missing a typeforward here?

C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.win-x86.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\win-x86\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.win-x86.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\win-x86\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=win7-x64
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=centos.7-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.win-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\win-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.win-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\win-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=debian.8-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=linuxmint.17-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=rhel.7.2-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=ubuntu.14.04-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=ubuntu.16.04-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=osx.10.12-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=fedora.24-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.osx-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\osx-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.osx-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\osx-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=opensuse.42.1-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netcoreapp3.0 RID=rhel.7-x64
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]
  Testing Microsoft.CSharp TFM=netstandard1.0
  Testing Microsoft.CSharp TFM=netstandard1.1
  Testing Microsoft.CSharp TFM=netstandard1.2
  Testing Microsoft.CSharp TFM=netstandard1.3
  Testing Microsoft.CSharp TFM=netstandard1.4
  Testing Microsoft.CSharp TFM=netstandard1.6
  Testing Microsoft.CSharp TFM=netstandard1.7
  Testing Microsoft.CSharp TFM=netstandard2.0
C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Payload\packageTest.targets(93,5): error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll. [C:\dotnetbuild\work\55b5af54-4309-4514-8160-024f5a0588ff\Work\ecb1e52c-d466-4b07-8854-d4e06ce773c8\Unzip\netcoreapp3.0\project.csproj]

cc: @vancem @brianrob @ericstj

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • All Checks Successful Unsuccessful checks: OSX x64 Debug Build, Packaging All Configurations x64 Debug Build, corefx-ci (Packaging All Configurations x64_Debug)

@ericstj
Copy link
Copy Markdown
Member

ericstj commented Feb 11, 2019

@sywhang started this with #35183

It's unclear to me if folks intend for this to be a type-forward or not. If so, add the type forward in this branch to fix this. If not, suppress the duplicate type warning to fix it.

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Feb 11, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • All Checks Successful Unsuccessful checks: OSX x64 Debug Build, Packaging All Configurations x64 Debug Build, corefx-ci, corefx-ci (Packaging All Configurations x64_Debug)

@safern
Copy link
Copy Markdown
Member

safern commented Feb 12, 2019

ping @sywhang ?

@ericstj
Copy link
Copy Markdown
Member

ericstj commented Feb 12, 2019

I'd just recommend adding the typeforwards (deleting source file reference from CSPROJ). If folks wanted something different than they can come back and fix it.

@sywhang
Copy link
Copy Markdown

sywhang commented Feb 12, 2019

Is deleting the source file reference from the CSPROJ for System.Diagnostics.Tracing the only thing I need to do to add typeforwards? Sorry I'm not very familiar with this space...

@safern
Copy link
Copy Markdown
Member

safern commented Feb 12, 2019

I just pushed a commit. I'll take care of it.

@safern
Copy link
Copy Markdown
Member

safern commented Feb 12, 2019

Actually based on the conflicts I realized it was just fixed on: 45b49ee

dotnet-maestro added 2 commits February 11, 2019 16:54
…0190210.1

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview-27410-1
- Microsoft.NETCore.DotNetHost - 3.0.0-preview-27410-1
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview-27410-1
…0190210.5

This change updates the following dependencies
- Microsoft.NETCore.App - 3.0.0-preview-27410-5
- Microsoft.NETCore.DotNetHost - 3.0.0-preview-27410-5
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview-27410-5
@safern safern force-pushed the darc-master-059be939-a178-4d39-a8e6-66062064f92d branch from 6036bed to d4d30f8 Compare February 12, 2019 00:54
@safern
Copy link
Copy Markdown
Member

safern commented Feb 12, 2019

Just rebased and pushed so that it contains the changes that fixes the type conflicts.

@safern
Copy link
Copy Markdown
Member

safern commented Feb 12, 2019

Actually what this PR needs is a new version of core-setup that contains the new changes of corefx that have the typeforwards, because currently the type exists in two places in the Microsoft.NETCore.App package which comes from core-setup.

error : Duplicate type System.Diagnostics.Tracing.EventCounter in both C:\dotnetbuild\work\d368593c-0683-48d6-8baa-820aba6d2787\Work\d3d153d5-c943-49fe-be17-0cafe0f89924\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\native\System.Private.CoreLib.dll and C:\dotnetbuild\work\d368593c-0683-48d6-8baa-820aba6d2787\Work\d3d153d5-c943-49fe-be17-0cafe0f89924\Unzip\packages\runtime.linux-x64.microsoft.netcore.app\3.0.0-preview-27410-5\runtimes\linux-x64\lib\netcoreapp3.0\System.Diagnostics.Tracing.dll.

@safern safern merged commit 4d5fee1 into master Feb 12, 2019
@safern safern deleted the darc-master-059be939-a178-4d39-a8e6-66062064f92d branch February 12, 2019 08:15
@karelz karelz added this to the 3.0 milestone Mar 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants