From ea069e820c0e6d3841747d789a1039857d2a83bf Mon Sep 17 00:00:00 2001 From: Anipik Date: Tue, 27 Oct 2020 21:18:11 -0700 Subject: [PATCH 1/4] using msbuild intrinsic functions to get tfm identifier and tfv version --- src/libraries/Directory.Build.targets | 4 ++-- .../src/Microsoft.Win32.Registry.csproj | 2 +- .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- src/libraries/Native/build-native.proj | 2 +- .../System.Data.Odbc/src/System.Data.Odbc.csproj | 2 +- .../src/System.Diagnostics.Process.csproj | 2 +- .../src/System.IO.FileSystem.DriveInfo.csproj | 4 ++-- .../UnitTests/System.Net.Http.Unit.Tests.csproj | 12 ++++++------ .../src/System.Text.Encoding.CodePages.csproj | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 0df45c84d2847b..16edbbd3475623 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -235,7 +235,7 @@ - true + true @@ -268,7 +268,7 @@ - true + true diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index c372d739a90a7b..ab962d316335ae 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -77,7 +77,7 @@ - + diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 4cdba1a506ea85..b5cc3175acbcd7 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -113,7 +113,7 @@ - + diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index 6f3d4aa0892b47..be9a7de9e981c4 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -42,7 +42,7 @@ + $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)'))"> diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index e118672a4a0a82..9286d2cfebd220 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -10,7 +10,7 @@ true - $(NoWarn);SA1121 + $(NoWarn);SA1121 SR.Odbc_PlatformNotSupported diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index e9f2630e6f0cc2..750902104e1c06 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -295,7 +295,7 @@ - + diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index fdc1f7b5f018a9..cac7326d0c2cf9 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -49,7 +49,7 @@ - + - + diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index c4dfd640d9a46e..72fb0d8fb49eb1 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -240,17 +240,17 @@ Link="ProductionCode\System\Net\Http\StringContent.cs" /> - - - - - @@ -259,7 +259,7 @@ - + diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 4f2826bd93ee55..375255d3883514 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -55,10 +55,10 @@ - + - + From 38d756ce3e929e6173173faf9eb653ceaf76705c Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Wed, 28 Oct 2020 07:27:59 -0700 Subject: [PATCH 2/4] Update src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj Co-authored-by: Viktor Hofer --- .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index b5cc3175acbcd7..b3e8685624b081 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -113,7 +113,7 @@ - + From d3c747bca9ceaaf823f1f8fbbc29746509f2f953 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Wed, 28 Oct 2020 07:28:55 -0700 Subject: [PATCH 3/4] Update build-native.proj --- src/libraries/Native/build-native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index be9a7de9e981c4..d7315f7dc9d883 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -42,7 +42,7 @@ + '$(TargetFramework)' == '$(NetCoreAppCurrent)'""> From b189fb4742a21d0a5408337ca99edc31168f7f78 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Wed, 28 Oct 2020 07:29:13 -0700 Subject: [PATCH 4/4] Update build-native.proj --- src/libraries/Native/build-native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index d7315f7dc9d883..6f3d4aa0892b47 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -42,7 +42,7 @@ + '$(TargetFramework)' == '$(NetCoreAppCurrent)'">