From: Jose Perez Rodriguez Date: Fri, 1 Jul 2016 21:23:54 +0000 (-0700) Subject: Moving all of the Compat Assemblies to flat folder (dotnet/corefx#9782) X-Git-Tag: submit/tizen/20210909.063632~11031^2~11196^2~2^2~198 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cc1b03ebc8e4e717f39ee249e84dc6b31e2ea92;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Moving all of the Compat Assemblies to flat folder (dotnet/corefx#9782) Moving all of the Compat Assemblies to flat folder Commit migrated from https://github.com/dotnet/corefx/commit/5eb4d84c51fdf0e90b9d9e143873131a7d51373f --- diff --git a/src/libraries/System.ComponentModel.Composition/src/ApiCompatBaseline.txt b/src/libraries/System.ComponentModel.Composition/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.ComponentModel.Composition/src/ApiCompatBaseline.txt rename to src/libraries/System.ComponentModel.Composition/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj similarity index 82% rename from src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj rename to src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj index 03c9b79..89821ba 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj @@ -9,7 +9,7 @@ $(GenFacadesArgs) -ignoreMissingTypes true {B0535517-3B72-4343-A773-3F3D68592919} - ..\ref\Compat\System.ComponentModel.Composition.csproj + ..\..\ref\Compat\System.ComponentModel.Composition.csproj @@ -18,4 +18,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System/src/project.json b/src/libraries/System.ComponentModel.Composition/src/Compat/project.json similarity index 100% rename from src/libraries/System/src/project.json rename to src/libraries/System.ComponentModel.Composition/src/Compat/project.json diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds index c3a7df5..d5fe11a 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Core/src/ApiCompatBaseline.txt b/src/libraries/System.Core/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Core/src/ApiCompatBaseline.txt rename to src/libraries/System.Core/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Core/src/System.Core.csproj b/src/libraries/System.Core/src/Compat/System.Core.csproj similarity index 83% rename from src/libraries/System.Core/src/System.Core.csproj rename to src/libraries/System.Core/src/Compat/System.Core.csproj index db423d2..273d564 100644 --- a/src/libraries/System.Core/src/System.Core.csproj +++ b/src/libraries/System.Core/src/Compat/System.Core.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Core.csproj + ..\..\ref\Compat\System.Core.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Xml.Serialization/src/project.json b/src/libraries/System.Core/src/Compat/project.json similarity index 100% rename from src/libraries/System.Xml.Serialization/src/project.json rename to src/libraries/System.Core/src/Compat/project.json diff --git a/src/libraries/System.Core/src/System.Core.builds b/src/libraries/System.Core/src/System.Core.builds index 16e2ff8..337583f 100644 --- a/src/libraries/System.Core/src/System.Core.builds +++ b/src/libraries/System.Core/src/System.Core.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Data.Services.Client/src/ApiCompatBaseline.txt b/src/libraries/System.Data.Services.Client/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Data.Services.Client/src/ApiCompatBaseline.txt rename to src/libraries/System.Data.Services.Client/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj b/src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj similarity index 82% rename from src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj rename to src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj index 2babdc4..767ca41 100644 --- a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj +++ b/src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Data.Services.Client.csproj + ..\..\ref\Compat\System.Data.Services.Client.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Windows/src/project.json b/src/libraries/System.Data.Services.Client/src/Compat/project.json similarity index 100% rename from src/libraries/System.Windows/src/project.json rename to src/libraries/System.Data.Services.Client/src/Compat/project.json diff --git a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds b/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds index 66c98fb..e1be658 100644 --- a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds +++ b/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Data/src/ApiCompatBaseline.txt b/src/libraries/System.Data/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Data/src/ApiCompatBaseline.txt rename to src/libraries/System.Data/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Data/src/System.Data.csproj b/src/libraries/System.Data/src/Compat/System.Data.csproj similarity index 83% rename from src/libraries/System.Data/src/System.Data.csproj rename to src/libraries/System.Data/src/Compat/System.Data.csproj index 4dc057b..0f727da 100644 --- a/src/libraries/System.Data/src/System.Data.csproj +++ b/src/libraries/System.Data/src/Compat/System.Data.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Data.csproj + ..\..\ref\Compat\System.Data.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Web.Services/src/project.json b/src/libraries/System.Data/src/Compat/project.json similarity index 100% rename from src/libraries/System.Web.Services/src/project.json rename to src/libraries/System.Data/src/Compat/project.json diff --git a/src/libraries/System.Data/src/System.Data.builds b/src/libraries/System.Data/src/System.Data.builds index df571e6..bab164f 100644 --- a/src/libraries/System.Data/src/System.Data.builds +++ b/src/libraries/System.Data/src/System.Data.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.IO.Compression.FileSystem/src/ApiCompatBaseline.txt b/src/libraries/System.EnterpriseServices/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.IO.Compression.FileSystem/src/ApiCompatBaseline.txt rename to src/libraries/System.EnterpriseServices/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj b/src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj similarity index 82% rename from src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj rename to src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj index 91b7901..7f231d9 100644 --- a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj +++ b/src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.EnterpriseServices.csproj + ..\..\ref\Compat\System.EnterpriseServices.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.EnterpriseServices/src/project.json b/src/libraries/System.EnterpriseServices/src/Compat/project.json similarity index 100% rename from src/libraries/System.EnterpriseServices/src/project.json rename to src/libraries/System.EnterpriseServices/src/Compat/project.json diff --git a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds b/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds index c09f572..973ea9f 100644 --- a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds +++ b/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.EnterpriseServices/src/ApiCompatBaseline.txt b/src/libraries/System.IO.Compression.FileSystem/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.EnterpriseServices/src/ApiCompatBaseline.txt rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj b/src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj similarity index 82% rename from src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj index 36e2fc5..61c9cbf3 100644 --- a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj +++ b/src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.IO.Compression.FileSystem.csproj + ..\..\ref\Compat\System.IO.Compression.FileSystem.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Transactions/src/project.json b/src/libraries/System.IO.Compression.FileSystem/src/Compat/project.json similarity index 100% rename from src/libraries/System.Transactions/src/project.json rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/project.json diff --git a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds b/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds index 8828cd5..3afcd6c 100644 --- a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds +++ b/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Net.Http.WebRequest/src/ApiCompatBaseline.txt b/src/libraries/System.Net.Http.WebRequest/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Net.Http.WebRequest/src/ApiCompatBaseline.txt rename to src/libraries/System.Net.Http.WebRequest/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj b/src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj similarity index 82% rename from src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj rename to src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj index f1ad8dd..1ee3fd1 100644 --- a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj +++ b/src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Net.Http.WebRequest.csproj + ..\..\ref\Compat\System.Net.Http.WebRequest.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Net/src/project.json b/src/libraries/System.Net.Http.WebRequest/src/Compat/project.json similarity index 100% rename from src/libraries/System.Net/src/project.json rename to src/libraries/System.Net.Http.WebRequest/src/Compat/project.json diff --git a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds b/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds index 51b0bd2..1307945 100644 --- a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds +++ b/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Net/src/ApiCompatBaseline.txt b/src/libraries/System.Net/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Net/src/ApiCompatBaseline.txt rename to src/libraries/System.Net/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Net/src/System.Net.csproj b/src/libraries/System.Net/src/Compat/System.Net.csproj similarity index 83% rename from src/libraries/System.Net/src/System.Net.csproj rename to src/libraries/System.Net/src/Compat/System.Net.csproj index fe8ed8b..47b8ab4 100644 --- a/src/libraries/System.Net/src/System.Net.csproj +++ b/src/libraries/System.Net/src/Compat/System.Net.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Net.csproj + ..\..\ref\Compat\System.Net.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Net.Http.WebRequest/src/project.json b/src/libraries/System.Net/src/Compat/project.json similarity index 100% rename from src/libraries/System.Net.Http.WebRequest/src/project.json rename to src/libraries/System.Net/src/Compat/project.json diff --git a/src/libraries/System.Net/src/System.Net.builds b/src/libraries/System.Net/src/System.Net.builds index 2ba75d1..bb3cbc5 100644 --- a/src/libraries/System.Net/src/System.Net.builds +++ b/src/libraries/System.Net/src/System.Net.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Numerics/src/ApiCompatBaseline.txt b/src/libraries/System.Numerics/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Numerics/src/ApiCompatBaseline.txt rename to src/libraries/System.Numerics/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Numerics/src/System.Numerics.csproj b/src/libraries/System.Numerics/src/Compat/System.Numerics.csproj similarity index 83% rename from src/libraries/System.Numerics/src/System.Numerics.csproj rename to src/libraries/System.Numerics/src/Compat/System.Numerics.csproj index 702f8e1..8abdf92 100644 --- a/src/libraries/System.Numerics/src/System.Numerics.csproj +++ b/src/libraries/System.Numerics/src/Compat/System.Numerics.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Numerics.csproj + ..\..\ref\Compat\System.Numerics.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Numerics/src/project.json b/src/libraries/System.Numerics/src/Compat/project.json similarity index 100% rename from src/libraries/System.Numerics/src/project.json rename to src/libraries/System.Numerics/src/Compat/project.json diff --git a/src/libraries/System.Numerics/src/System.Numerics.builds b/src/libraries/System.Numerics/src/System.Numerics.builds index 7de382c..9b83f97 100644 --- a/src/libraries/System.Numerics/src/System.Numerics.builds +++ b/src/libraries/System.Numerics/src/System.Numerics.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Runtime.Serialization/src/ApiCompatBaseline.txt b/src/libraries/System.Runtime.Serialization/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Runtime.Serialization/src/ApiCompatBaseline.txt rename to src/libraries/System.Runtime.Serialization/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj b/src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj similarity index 82% rename from src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj rename to src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj index 241bca1..aa43341 100644 --- a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj +++ b/src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Runtime.Serialization.csproj + ..\..\ref\Compat\System.Runtime.Serialization.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Runtime.Serialization/src/project.json b/src/libraries/System.Runtime.Serialization/src/Compat/project.json similarity index 100% rename from src/libraries/System.Runtime.Serialization/src/project.json rename to src/libraries/System.Runtime.Serialization/src/Compat/project.json diff --git a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds b/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds index 15df0fb..da36b25 100644 --- a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds +++ b/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.ServiceModel/src/ApiCompatBaseline.txt b/src/libraries/System.ServiceModel/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.ServiceModel/src/ApiCompatBaseline.txt rename to src/libraries/System.ServiceModel/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.ServiceModel/src/System.ServiceModel.csproj b/src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj similarity index 82% rename from src/libraries/System.ServiceModel/src/System.ServiceModel.csproj rename to src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj index 4f60f7a..d5a150e 100644 --- a/src/libraries/System.ServiceModel/src/System.ServiceModel.csproj +++ b/src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.ServiceModel.csproj + ..\..\ref\Compat\System.ServiceModel.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.ServiceModel/src/project.json b/src/libraries/System.ServiceModel/src/Compat/project.json similarity index 66% rename from src/libraries/System.ServiceModel/src/project.json rename to src/libraries/System.ServiceModel/src/Compat/project.json index 2c469d9..9efe420 100644 --- a/src/libraries/System.ServiceModel/src/project.json +++ b/src/libraries/System.ServiceModel/src/Compat/project.json @@ -5,7 +5,9 @@ "System.ServiceModel.Http": "4.1.1-beta-24222-03", "System.ServiceModel.NetTcp": " 4.1.1-beta-24222-03", "System.ServiceModel.Primitives": "4.1.1-beta-24222-03", - "System.ServiceModel.Security": " 4.0.2-beta-24222-03" + "System.ServiceModel.Security": " 4.0.2-beta-24222-03", + "System.Runtime.Serialization.Primitives": "4.1.2-beta-24222-03", + "System.Runtime.Serialization.Xml": "4.1.2-beta-24222-03" }, "frameworks": { "netstandard1.6": { diff --git a/src/libraries/System.ServiceModel/src/System.ServiceModel.builds b/src/libraries/System.ServiceModel/src/System.ServiceModel.builds index 54fe57c..9e5695d 100644 --- a/src/libraries/System.ServiceModel/src/System.ServiceModel.builds +++ b/src/libraries/System.ServiceModel/src/System.ServiceModel.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Transactions/src/ApiCompatBaseline.txt b/src/libraries/System.Transactions/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Transactions/src/ApiCompatBaseline.txt rename to src/libraries/System.Transactions/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Transactions/src/System.Transactions.csproj b/src/libraries/System.Transactions/src/Compat/System.Transactions.csproj similarity index 82% rename from src/libraries/System.Transactions/src/System.Transactions.csproj rename to src/libraries/System.Transactions/src/Compat/System.Transactions.csproj index 3d4df8c..87507a5 100644 --- a/src/libraries/System.Transactions/src/System.Transactions.csproj +++ b/src/libraries/System.Transactions/src/Compat/System.Transactions.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Transactions.csproj + ..\..\ref\Compat\System.Transactions.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.IO.Compression.FileSystem/src/project.json b/src/libraries/System.Transactions/src/Compat/project.json similarity index 100% rename from src/libraries/System.IO.Compression.FileSystem/src/project.json rename to src/libraries/System.Transactions/src/Compat/project.json diff --git a/src/libraries/System.Transactions/src/System.Transactions.builds b/src/libraries/System.Transactions/src/System.Transactions.builds index dc058b3..490ad7f 100644 --- a/src/libraries/System.Transactions/src/System.Transactions.builds +++ b/src/libraries/System.Transactions/src/System.Transactions.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Web.Services/src/ApiCompatBaseline.txt b/src/libraries/System.Web.Services/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Web.Services/src/ApiCompatBaseline.txt rename to src/libraries/System.Web.Services/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Web.Services/src/System.Web.Services.csproj b/src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj similarity index 82% rename from src/libraries/System.Web.Services/src/System.Web.Services.csproj rename to src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj index e3fa76c9..769617d 100644 --- a/src/libraries/System.Web.Services/src/System.Web.Services.csproj +++ b/src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Web.Services.csproj + ..\..\ref\Compat\System.Web.Services.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Data/src/project.json b/src/libraries/System.Web.Services/src/Compat/project.json similarity index 100% rename from src/libraries/System.Data/src/project.json rename to src/libraries/System.Web.Services/src/Compat/project.json diff --git a/src/libraries/System.Web.Services/src/System.Web.Services.builds b/src/libraries/System.Web.Services/src/System.Web.Services.builds index 261d2f4..286d8c1 100644 --- a/src/libraries/System.Web.Services/src/System.Web.Services.builds +++ b/src/libraries/System.Web.Services/src/System.Web.Services.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Windows/src/ApiCompatBaseline.txt b/src/libraries/System.Windows/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Windows/src/ApiCompatBaseline.txt rename to src/libraries/System.Windows/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Windows/src/System.Windows.csproj b/src/libraries/System.Windows/src/Compat/System.Windows.csproj similarity index 83% rename from src/libraries/System.Windows/src/System.Windows.csproj rename to src/libraries/System.Windows/src/Compat/System.Windows.csproj index ff741d5..5347f45 100644 --- a/src/libraries/System.Windows/src/System.Windows.csproj +++ b/src/libraries/System.Windows/src/Compat/System.Windows.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Windows.csproj + ..\..\ref\Compat\System.Windows.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Data.Services.Client/src/project.json b/src/libraries/System.Windows/src/Compat/project.json similarity index 100% rename from src/libraries/System.Data.Services.Client/src/project.json rename to src/libraries/System.Windows/src/Compat/project.json diff --git a/src/libraries/System.Windows/src/System.Windows.builds b/src/libraries/System.Windows/src/System.Windows.builds index 11888d2..4a6b748 100644 --- a/src/libraries/System.Windows/src/System.Windows.builds +++ b/src/libraries/System.Windows/src/System.Windows.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System.Xml.Serialization/src/ApiCompatBaseline.txt b/src/libraries/System.Xml.Serialization/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Xml.Serialization/src/ApiCompatBaseline.txt rename to src/libraries/System.Xml.Serialization/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj b/src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj similarity index 82% rename from src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj rename to src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj index 6e61ebd..9e46987 100644 --- a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj +++ b/src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.Xml.Serialization.csproj + ..\..\ref\Compat\System.Xml.Serialization.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/System.Core/src/project.json b/src/libraries/System.Xml.Serialization/src/Compat/project.json similarity index 100% rename from src/libraries/System.Core/src/project.json rename to src/libraries/System.Xml.Serialization/src/Compat/project.json diff --git a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds b/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds index 05bf606..d3234b3 100644 --- a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds +++ b/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/System/src/ApiCompatBaseline.txt b/src/libraries/System/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/System/src/ApiCompatBaseline.txt rename to src/libraries/System/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/System/src/System.csproj b/src/libraries/System/src/Compat/System.csproj similarity index 84% rename from src/libraries/System/src/System.csproj rename to src/libraries/System/src/Compat/System.csproj index 5669ae8..4e6c3d5 100644 --- a/src/libraries/System/src/System.csproj +++ b/src/libraries/System/src/Compat/System.csproj @@ -9,7 +9,7 @@ ..\ref\System.csproj $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\System.csproj + ..\..\ref\Compat\System.csproj @@ -18,4 +18,7 @@ + + + diff --git a/src/libraries/System.ComponentModel.Composition/src/project.json b/src/libraries/System/src/Compat/project.json similarity index 100% rename from src/libraries/System.ComponentModel.Composition/src/project.json rename to src/libraries/System/src/Compat/project.json diff --git a/src/libraries/System/src/System.builds b/src/libraries/System/src/System.builds index db11f82..384a8f9 100644 --- a/src/libraries/System/src/System.builds +++ b/src/libraries/System/src/System.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/mscorlib/mscorlib.sln b/src/libraries/mscorlib/mscorlib.sln index f7fd8849..478f32fd 100644 --- a/src/libraries/mscorlib/mscorlib.sln +++ b/src/libraries/mscorlib/mscorlib.sln @@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6DF80D ..\.nuget\packages.Windows_NT.config = ..\.nuget\packages.Windows_NT.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mscorlib", "src\mscorlib.csproj", "{1B8337CE-3B0A-4447-9620-D9B5EE3E552D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mscorlib", "src\Compat\mscorlib.csproj", "{1B8337CE-3B0A-4447-9620-D9B5EE3E552D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/libraries/mscorlib/src/ApiCompatBaseline.txt b/src/libraries/mscorlib/src/Compat/ApiCompatBaseline.txt similarity index 100% rename from src/libraries/mscorlib/src/ApiCompatBaseline.txt rename to src/libraries/mscorlib/src/Compat/ApiCompatBaseline.txt diff --git a/src/libraries/mscorlib/src/mscorlib.csproj b/src/libraries/mscorlib/src/Compat/mscorlib.csproj similarity index 83% rename from src/libraries/mscorlib/src/mscorlib.csproj rename to src/libraries/mscorlib/src/Compat/mscorlib.csproj index e2935e2..7edc48f 100644 --- a/src/libraries/mscorlib/src/mscorlib.csproj +++ b/src/libraries/mscorlib/src/Compat/mscorlib.csproj @@ -8,7 +8,7 @@ true $(GenFacadesArgs) -ignoreMissingTypes true - ..\ref\Compat\mscorlib.csproj + ..\..\ref\Compat\mscorlib.csproj @@ -17,4 +17,7 @@ + + + diff --git a/src/libraries/mscorlib/src/project.json b/src/libraries/mscorlib/src/Compat/project.json similarity index 100% rename from src/libraries/mscorlib/src/project.json rename to src/libraries/mscorlib/src/Compat/project.json diff --git a/src/libraries/mscorlib/src/mscorlib.builds b/src/libraries/mscorlib/src/mscorlib.builds index 18066eb..75628e8 100644 --- a/src/libraries/mscorlib/src/mscorlib.builds +++ b/src/libraries/mscorlib/src/mscorlib.builds @@ -2,7 +2,7 @@ - + diff --git a/src/libraries/post.builds b/src/libraries/post.builds index 9f63aa5..69fa304 100644 --- a/src/libraries/post.builds +++ b/src/libraries/post.builds @@ -15,4 +15,20 @@ + + + + + true + true + + + + + + + +