From 0ef271dcc2238b904990ae913aebd92244afd690 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Wed, 4 Jan 2017 23:50:10 +0100 Subject: [PATCH] [msvc] Update csproj files (#4204) --- .../Facades_System.ValueTuple-net_4_x.csproj | 2 +- .../Mono.Data.Sqlite-net_4_x.csproj | 4 +- .../System.Core/System.Core-net_4_x.csproj | 493 ++++++++---------- .../System.Drawing-net_4_x.csproj | 4 +- ...m.IO.Compression.FileSystem-net_4_x.csproj | 14 +- mcs/class/System/System-bare-net_4_x.csproj | 5 +- mcs/class/System/System-net_4_x.csproj | 5 +- mcs/class/System/System-secxml-net_4_x.csproj | 5 +- mcs/ilasm/ilasm-net_4_x.csproj | 8 +- msvc/scripts/order.xml | 102 ++-- net_4_x.sln | 6 - 11 files changed, 306 insertions(+), 342 deletions(-) diff --git a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple-net_4_x.csproj b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple-net_4_x.csproj index 735c13ee55f..6b6607f45dd 100644 --- a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple-net_4_x.csproj +++ b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple-net_4_x.csproj @@ -28,7 +28,7 @@ true - ../../msfinal.pub + ../../Open.snk true diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj index 68b8199972c..ceffcdc4575 100644 --- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj +++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj @@ -50,12 +50,10 @@ - - + - diff --git a/mcs/class/System.Core/System.Core-net_4_x.csproj b/mcs/class/System.Core/System.Core-net_4_x.csproj index b62eb154e8d..1cd5edb1d16 100644 --- a/mcs/class/System.Core/System.Core-net_4_x.csproj +++ b/mcs/class/System.Core/System.Core-net_4_x.csproj @@ -8,7 +8,7 @@ 2.0 {359142A1-D80F-401E-AA64-7167C9317649} Library - 1699,436,1720 + 1699,436 ./../../class/lib/net_4_x obj-net_4_x false @@ -27,17 +27,17 @@ true full - 1699,436,1720 + 1699,436 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_COMPILE;FEATURE_COMPILE_TO_METHODBUILDER;FEATURE_PDB_GENERATOR prompt 4 pdbonly - 1699,436,1720 + 1699,436 true - NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_COMPILE;FEATURE_COMPILE_TO_METHODBUILDER;FEATURE_PDB_GENERATOR prompt 4 @@ -49,126 +49,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -184,146 +286,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,6 +312,9 @@ + + + @@ -357,10 +322,8 @@ - - diff --git a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj index f46f7c3a73e..1ee389fd421 100644 --- a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj +++ b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj @@ -29,7 +29,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_TYPECONVERTER + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_TYPECONVERTER;SUPPORTS_WINDOWS_COLORS prompt 4 @@ -37,7 +37,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_TYPECONVERTER + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_TYPECONVERTER;SUPPORTS_WINDOWS_COLORS prompt 4 diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj index 44bcdd9a644..87279888cfc 100644 --- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj +++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj @@ -15,7 +15,7 @@ True True - + true Properties @@ -49,11 +49,17 @@ + + + + + + + + - - - +