From 48c66e52e455204c9a88c2ec9cbad344a341bd1a Mon Sep 17 00:00:00 2001 From: Anipik Date: Thu, 9 Jul 2020 15:38:52 -0700 Subject: [PATCH 1/3] stop cross targeting --- ...System.Diagnostics.TextWriterTraceListener.csproj | 4 +--- .../src/System.Diagnostics.TraceSource.csproj | 12 ++++++++---- .../System.Diagnostics.TraceSource.Tests.csproj | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index ee094ea301e8b3..d179081ce20e39 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj @@ -1,8 +1,6 @@ - System.Diagnostics.TextWriterTraceListener - System.Diagnostics.TextWriterTraceListener - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index b13f7ff9528db5..c18fbc461b589c 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -29,11 +29,15 @@ + + + + + + + + - - - - diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj index e463dec5af3f03..a143a9a0f05264 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent) From 7f12b78080acdf5dcad8460bdadee228931db4a1 Mon Sep 17 00:00:00 2001 From: Anipik Date: Thu, 9 Jul 2020 15:51:15 -0700 Subject: [PATCH 2/3] removing rids from src as well --- .../src/System.Diagnostics.TraceSource.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index c18fbc461b589c..af72b50ab587db 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -1,7 +1,7 @@ $(DefineConstants);TRACE - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent) enable From 630d6a51feb7a05066a8bdd42a4b0e69ceb90df4 Mon Sep 17 00:00:00 2001 From: Anipik Date: Thu, 9 Jul 2020 15:55:23 -0700 Subject: [PATCH 3/3] use project references where possible --- .../src/System.Diagnostics.TraceSource.csproj | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index af72b50ab587db..7baa10ff2bb9e4 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -29,15 +29,11 @@ - - - - - - - + + +