diff --git a/Tools-Override/depProj.targets b/Tools-Override/depProj.targets
index 807f5d0e7d83..241f5d24f7b4 100644
--- a/Tools-Override/depProj.targets
+++ b/Tools-Override/depProj.targets
@@ -96,18 +96,31 @@ See the LICENSE file in the project root for more information.
-
+
- <_referenceCopyLocalByPackageId Include="@(ReferenceCopyLocalPaths->'%(NuGetPackageId)')">
+ <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/>
+ <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')">
%(Identity)
-
+
- <_referenceCopyLocalByPackageIdToRemove Include="@(_referenceCopyLocalByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" />
- <_filteredReferenceCopyLocalByPackageId Include="@(_referenceCopyLocalByPackageId)" Exclude="@(_referenceCopyLocalByPackageIdToRemove);@(PackageToExclude)" />
+ <_nuGetDeployByFileNameToRemove Include="@(_nuGetDeployByFileName)" Exclude="@(FileToInclude)" Condition="'@(FileToInclude)' != ''" />
+ <_filteredNuGetDeployByFileName Include="@(_nuGetDeployByFileName)" Exclude="@(_nuGetDeployByFileNameToRemove);@(FileToExclude)" />
+
+ <_nuGetDeployByPackageId Include="@(_filteredNuGetDeployByFileName->'%(NuGetPackageId)')" />
-
-
+ <_nuGetDeployByPackageIdToRemove Include="@(_nuGetDeployByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" />
+ <_filteredNuGetDeployByPackageId Include="@(_nuGetDeployByPackageId)" Exclude="@(_nuGetDeployByPackageIdToRemove);@(PackageToExclude)" />
+
+
+
+
+
+
+
+
diff --git a/binplace.targets b/binplace.targets
index 0a32d393a2eb..901fc2eab426 100644
--- a/binplace.targets
+++ b/binplace.targets
@@ -2,7 +2,7 @@
- true
+ true
true
@@ -11,8 +11,8 @@
true
- true
- true
+ true
+ true
true
@@ -30,9 +30,22 @@
$(NETCoreAppPackageRefPath)
$(NETCoreAppPackageRuntimePath)
+
$(RefRootPath)netstandard
+
+ $(RefRootPath)netcoreapp
+
+
+ $(RefRootPath)uap
+
+
+ $(RefRootPath)netfx
+
@@ -43,13 +56,13 @@
-
+
-
+
diff --git a/buildvertical.targets b/buildvertical.targets
index 6246f0b53dec..3c841f0a7e67 100644
--- a/buildvertical.targets
+++ b/buildvertical.targets
@@ -22,15 +22,19 @@
+
+ <_projectBuildConfigurations>
+ Configuration=%(Identity);%(_projectBuildConfigurations.AdditionalProperties)
+
+
- <_ProjectWithConfiguration Include="@(_projectBuildConfigurations->'%(OriginalItemSpec)')">
- Configuration=%(Identity);%(_ProjectBestConfigurations.AdditionalProperties)
-
+ <_projectWithConfiguration Include="@(_projectBuildConfigurations->'%(OriginalItemSpec)')" />
-
+
diff --git a/external/dir.props b/external/dir.props
index 71a38f6da7a7..7381f12a0072 100644
--- a/external/dir.props
+++ b/external/dir.props
@@ -1,7 +1,7 @@
- $(IntermediateOutputPath)$(ArchGroup)/
+ $(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/
$(RuntimeOS)-$(ArchGroup)
diff --git a/external/dir.targets b/external/dir.targets
index 85107efc51a9..6ae7dc605a85 100644
--- a/external/dir.targets
+++ b/external/dir.targets
@@ -42,4 +42,7 @@
+
+
+
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj
index e57bdcf5d336..9401adafda64 100644
--- a/external/netfx/netfx.depproj
+++ b/external/netfx/netfx.depproj
@@ -2,7 +2,7 @@
- true
+ true
Reference
None
@@ -21,27 +21,9 @@
$(RefPath)
$(NetFxRefPath)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj
index c389c944bfcc..4553750dec25 100644
--- a/external/netstandard/netstandard.depproj
+++ b/external/netstandard/netstandard.depproj
@@ -5,7 +5,7 @@
true
true
true
- true
+ true
true
Reference
diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template
index 1b1c6ce414d4..ae43c47a0fed 100644
--- a/external/netstandard/netstandard1.x/project.json.template
+++ b/external/netstandard/netstandard1.x/project.json.template
@@ -3,7 +3,10 @@
"{TFM}": {
"dependencies": {
"NETStandard.Library": "2.0.0-beta-24928-01",
- "System.Diagnostics.Contracts": "4.3.0"
+ "System.Diagnostics.Contracts": "4.3.0",
+ "System.Diagnostics.Debug": "4.3.0",
+ "System.Dynamic.Runtime": "4.3.0",
+ "System.Runtime.Serialization.Primitives": "4.3.0"
}
}
}
diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj
index 8d96954c9c26..3521f89523f7 100644
--- a/external/portable/portable.depproj
+++ b/external/portable/portable.depproj
@@ -2,7 +2,7 @@
- true
+ true
Reference
None
@@ -13,5 +13,4 @@
-
\ No newline at end of file
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props
index 38f4dab7aabe..6ea99618b997 100644
--- a/external/runtime/Configurations.props
+++ b/external/runtime/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap;
uapaot;
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 68ddad5f544c..fd50c9cfe5f7 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -2,6 +2,9 @@
+
+ win7-x64
+ ubuntu.14.04-x64
$(RuntimeOS)-x64
@@ -9,13 +12,5 @@
$(MSBuildThisFileDirectory)NETNative/project.json.template
Reference
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json
index d56a7b8ffd38..daedd89978eb 100644
--- a/external/test-runtime/project.json
+++ b/external/test-runtime/project.json
@@ -7,8 +7,6 @@
"Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
- "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25003-02",
- "Microsoft.NETCore.TestHost": "2.0.0-beta-25003-02",
"Newtonsoft.Json": "9.0.1",
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
diff --git a/src/Common/src/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs b/src/Common/src/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs
new file mode 100644
index 000000000000..51de8396c8e4
--- /dev/null
+++ b/src/Common/src/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace System.Diagnostics.CodeAnalysis
+{
+ [AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event, Inherited = false, AllowMultiple = false)]
+#if SYSTEM_DIAGNOSTICS_TOOLS
+ public
+#else
+ internal
+#endif
+ sealed class ExcludeFromCodeCoverageAttribute: Attribute
+ {
+ public ExcludeFromCodeCoverageAttribute()
+ { }
+ }
+}
diff --git a/src/Microsoft.CSharp/Microsoft.CSharp.sln b/src/Microsoft.CSharp/Microsoft.CSharp.sln
index 814d7a6785ed..d3e21430cdd0 100644
--- a/src/Microsoft.CSharp/Microsoft.CSharp.sln
+++ b/src/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp.Tests", "tests/Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}"
ProjectSection(ProjectDependencies) = postProject
{96AA2060-C846-4E56-9509-E8CB9C114C8F} = {96AA2060-C846-4E56-9509-E8CB9C114C8F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "src\Microsoft.CSharp.csproj", "{96AA2060-C846-4E56-9509-E8CB9C114C8F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "src/Microsoft.CSharp.csproj", "{96AA2060-C846-4E56-9509-E8CB9C114C8F}"
ProjectSection(ProjectDependencies) = postProject
{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {1427906B-FF3D-422A-8278-F2B7E89DE12A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "ref\Microsoft.CSharp.csproj", "{1427906B-FF3D-422A-8278-F2B7E89DE12A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "ref/Microsoft.CSharp.csproj", "{1427906B-FF3D-422A-8278-F2B7E89DE12A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln b/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln
index e380ad26b1f3..c7957298f051 100644
--- a/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln
+++ b/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualBasic.Tests", "tests\Microsoft.VisualBasic.Tests.csproj", "{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualBasic.Tests", "tests/Microsoft.VisualBasic.Tests.csproj", "{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}"
ProjectSection(ProjectDependencies) = postProject
{FE25D593-8029-4726-ABC2-944522B5BE04} = {FE25D593-8029-4726-ABC2-944522B5BE04}
EndProjectSection
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Microsoft.VisualBasic", "src\Microsoft.VisualBasic.vbproj", "{FE25D593-8029-4726-ABC2-944522B5BE04}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Microsoft.VisualBasic", "src/Microsoft.VisualBasic.vbproj", "{FE25D593-8029-4726-ABC2-944522B5BE04}"
ProjectSection(ProjectDependencies) = postProject
{83AAB173-0A5E-4F7A-A1B4-D847F6D49B5F} = {83AAB173-0A5E-4F7A-A1B4-D847F6D49B5F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualBasic", "ref\Microsoft.VisualBasic.csproj", "{83AAB173-0A5E-4F7A-A1B4-D847F6D49B5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualBasic", "ref/Microsoft.VisualBasic.csproj", "{83AAB173-0A5E-4F7A-A1B4-D847F6D49B5F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/Microsoft.VisualBasic/src/Configurations.props b/src/Microsoft.VisualBasic/src/Configurations.props
index b2db63711061..c398e42e8994 100644
--- a/src/Microsoft.VisualBasic/src/Configurations.props
+++ b/src/Microsoft.VisualBasic/src/Configurations.props
@@ -2,7 +2,6 @@
- netstandard1.3;
netstandard;
diff --git a/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
index 32a033cca371..96a93a83cd59 100644
--- a/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
+++ b/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives.Tests", "tests\Microsoft.Win32.Primitives.Tests.csproj", "{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives.Tests", "tests/Microsoft.Win32.Primitives.Tests.csproj", "{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}"
ProjectSection(ProjectDependencies) = postProject
{8FFE99C0-22F8-4462-B839-970EAC1B3472} = {8FFE99C0-22F8-4462-B839-970EAC1B3472}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives", "src\Microsoft.Win32.Primitives.csproj", "{8FFE99C0-22F8-4462-B839-970EAC1B3472}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives", "src/Microsoft.Win32.Primitives.csproj", "{8FFE99C0-22F8-4462-B839-970EAC1B3472}"
ProjectSection(ProjectDependencies) = postProject
{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED} = {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives", "ref\Microsoft.Win32.Primitives.csproj", "{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives", "ref/Microsoft.Win32.Primitives.csproj", "{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln b/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
index 8a32812008c7..d5b2a8914174 100644
--- a/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
+++ b/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl.Tests", "tests\Microsoft.Win32.Registry.AccessControl.Tests.csproj", "{C2B7761E-A4C0-4285-8B83-CC426A1494FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl.Tests", "tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj", "{C2B7761E-A4C0-4285-8B83-CC426A1494FA}"
ProjectSection(ProjectDependencies) = postProject
{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2} = {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl", "src\Microsoft.Win32.Registry.AccessControl.csproj", "{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl", "src/Microsoft.Win32.Registry.AccessControl.csproj", "{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}"
ProjectSection(ProjectDependencies) = postProject
{389CCAC2-E1C2-4185-AC01-2035CB99B5ED} = {389CCAC2-E1C2-4185-AC01-2035CB99B5ED}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl", "ref\Microsoft.Win32.Registry.AccessControl.csproj", "{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.AccessControl", "ref/Microsoft.Win32.Registry.AccessControl.csproj", "{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
index c61c9558399d..32f51263e092 100644
--- a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
@@ -23,13 +23,13 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
index 53f605c25bd4..5c66a49fc345 100644
--- a/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
+++ b/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.Tests", "tests\Microsoft.Win32.Registry.Tests.csproj", "{20A2BA2C-5517-483F-8FFE-643441A59852}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry.Tests", "tests/Microsoft.Win32.Registry.Tests.csproj", "{20A2BA2C-5517-483F-8FFE-643441A59852}"
ProjectSection(ProjectDependencies) = postProject
{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F} = {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry", "src\Microsoft.Win32.Registry.csproj", "{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry", "src/Microsoft.Win32.Registry.csproj", "{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}"
ProjectSection(ProjectDependencies) = postProject
{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18} = {EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry", "ref\Microsoft.Win32.Registry.csproj", "{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Registry", "ref/Microsoft.Win32.Registry.csproj", "{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.AppContext/System.AppContext.sln b/src/System.AppContext/System.AppContext.sln
index 3add3a8d24e8..eb362442dd5f 100644
--- a/src/System.AppContext/System.AppContext.sln
+++ b/src/System.AppContext/System.AppContext.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext.Tests", "tests\System.AppContext.Tests.csproj", "{6F04B167-A03F-4206-8481-60213C3EF9B9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext.Tests", "tests/System.AppContext.Tests.csproj", "{6F04B167-A03F-4206-8481-60213C3EF9B9}"
ProjectSection(ProjectDependencies) = postProject
{5522BAFC-E2FF-4896-993A-401DDEDFD85F} = {5522BAFC-E2FF-4896-993A-401DDEDFD85F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext", "src\System.AppContext.csproj", "{5522BAFC-E2FF-4896-993A-401DDEDFD85F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext", "src/System.AppContext.csproj", "{5522BAFC-E2FF-4896-993A-401DDEDFD85F}"
ProjectSection(ProjectDependencies) = postProject
{2D7BBD88-739E-472A-9F44-2794049A688F} = {2D7BBD88-739E-472A-9F44-2794049A688F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext", "ref\System.AppContext.csproj", "{2D7BBD88-739E-472A-9F44-2794049A688F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.AppContext", "ref/System.AppContext.csproj", "{2D7BBD88-739E-472A-9F44-2794049A688F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.AppContext/src/Configurations.props b/src/System.AppContext/src/Configurations.props
index 674306c1ddb2..11b4c45db2e1 100644
--- a/src/System.AppContext/src/Configurations.props
+++ b/src/System.AppContext/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj
index f9b69f4a64f9..210a43e08966 100644
--- a/src/System.AppContext/src/System.AppContext.csproj
+++ b/src/System.AppContext/src/System.AppContext.csproj
@@ -7,11 +7,13 @@
true
true
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
-
-
+
+
+
+
diff --git a/src/System.Buffers/System.Buffers.sln b/src/System.Buffers/System.Buffers.sln
index cd908cdbd09e..54c12a092753 100644
--- a/src/System.Buffers/System.Buffers.sln
+++ b/src/System.Buffers/System.Buffers.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers.Tests", "tests\System.Buffers.Tests.csproj", "{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers.Tests", "tests/System.Buffers.Tests.csproj", "{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}"
ProjectSection(ProjectDependencies) = postProject
{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B} = {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers", "src\System.Buffers.csproj", "{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers", "src/System.Buffers.csproj", "{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}"
ProjectSection(ProjectDependencies) = postProject
{11AE73F7-3532-47B9-8FF6-B4F22D76456C} = {11AE73F7-3532-47B9-8FF6-B4F22D76456C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers", "ref\System.Buffers.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Buffers", "ref/System.Buffers.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
diff --git a/src/System.Buffers/ref/Configurations.props b/src/System.Buffers/ref/Configurations.props
index c398e42e8994..a66f1edba4a0 100644
--- a/src/System.Buffers/ref/Configurations.props
+++ b/src/System.Buffers/ref/Configurations.props
@@ -3,6 +3,7 @@
netstandard;
+ netstandard1.1;
\ No newline at end of file
diff --git a/src/System.Buffers/ref/System.Buffers.csproj b/src/System.Buffers/ref/System.Buffers.csproj
index 6ee65d7b8695..878d3f1b51d7 100644
--- a/src/System.Buffers/ref/System.Buffers.csproj
+++ b/src/System.Buffers/ref/System.Buffers.csproj
@@ -7,8 +7,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/System.Buffers/src/Configurations.props b/src/System.Buffers/src/Configurations.props
index c3b1e70d7bb8..2f6cdc38e2b9 100644
--- a/src/System.Buffers/src/Configurations.props
+++ b/src/System.Buffers/src/Configurations.props
@@ -4,7 +4,8 @@
netstandard1.1;
netstandard;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.Buffers/src/System.Buffers.csproj b/src/System.Buffers/src/System.Buffers.csproj
index c4f2f57267bc..43032dc7ab74 100644
--- a/src/System.Buffers/src/System.Buffers.csproj
+++ b/src/System.Buffers/src/System.Buffers.csproj
@@ -9,8 +9,10 @@
true
-
-
+
+
+
+
@@ -29,11 +31,11 @@
-
-
-
-
+
+
+
+
diff --git a/src/System.CodeDom/System.CodeDom.sln b/src/System.CodeDom/System.CodeDom.sln
index 674358161711..78b27a794660 100644
--- a/src/System.CodeDom/System.CodeDom.sln
+++ b/src/System.CodeDom/System.CodeDom.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom.Tests", "tests\System.CodeDom.Tests.csproj", "{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom.Tests", "tests/System.CodeDom.Tests.csproj", "{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}"
ProjectSection(ProjectDependencies) = postProject
{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {53D09AF4-0C13-4197-B8AD-9746F0374E88}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "src\System.CodeDom.csproj", "{53D09AF4-0C13-4197-B8AD-9746F0374E88}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "src/System.CodeDom.csproj", "{53D09AF4-0C13-4197-B8AD-9746F0374E88}"
ProjectSection(ProjectDependencies) = postProject
{4CF42F1E-B5AC-4834-AE24-A1F285091377} = {4CF42F1E-B5AC-4834-AE24-A1F285091377}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "ref\System.CodeDom.csproj", "{4CF42F1E-B5AC-4834-AE24-A1F285091377}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CodeDom", "ref/System.CodeDom.csproj", "{4CF42F1E-B5AC-4834-AE24-A1F285091377}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/System.Collections.Concurrent/System.Collections.Concurrent.sln
index ce3ca8163b8c..c86618883c0d 100644
--- a/src/System.Collections.Concurrent/System.Collections.Concurrent.sln
+++ b/src/System.Collections.Concurrent/System.Collections.Concurrent.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent.Tests", "tests\System.Collections.Concurrent.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent.Tests", "tests/System.Collections.Concurrent.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
ProjectSection(ProjectDependencies) = postProject
{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "src\System.Collections.Concurrent.csproj", "{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "src/System.Collections.Concurrent.csproj", "{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}"
ProjectSection(ProjectDependencies) = postProject
{772CB0A7-3D45-4D3A-B975-671A1937C761} = {772CB0A7-3D45-4D3A-B975-671A1937C761}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "ref\System.Collections.Concurrent.csproj", "{772CB0A7-3D45-4D3A-B975-671A1937C761}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "ref/System.Collections.Concurrent.csproj", "{772CB0A7-3D45-4D3A-B975-671A1937C761}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections.Immutable/System.Collections.Immutable.sln b/src/System.Collections.Immutable/System.Collections.Immutable.sln
index f37506c63c12..b2e8528ac2c1 100644
--- a/src/System.Collections.Immutable/System.Collections.Immutable.sln
+++ b/src/System.Collections.Immutable/System.Collections.Immutable.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Immutable.Tests", "tests\System.Collections.Immutable.Tests.csproj", "{95DFC527-4DC1-495E-97D7-E94EE1F7140D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Immutable.Tests", "tests/System.Collections.Immutable.Tests.csproj", "{95DFC527-4DC1-495E-97D7-E94EE1F7140D}"
ProjectSection(ProjectDependencies) = postProject
{1DD0FF15-6234-4BD6-850A-317F05479554} = {1DD0FF15-6234-4BD6-850A-317F05479554}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Immutable", "src\System.Collections.Immutable.csproj", "{1DD0FF15-6234-4BD6-850A-317F05479554}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Immutable", "src/System.Collections.Immutable.csproj", "{1DD0FF15-6234-4BD6-850A-317F05479554}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
index f0757a9ea89e..0b0dc67bbf6f 100644
--- a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+++ b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -102,6 +102,11 @@
Common\System\Runtime\Versioning\NonVersionableAttribute.cs
+
+
+ Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs
+
+
diff --git a/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
index 5d52e75f7c8e..964109d57f3b 100644
--- a/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
+++ b/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric.Tests", "tests\System.Collections.NonGeneric.Tests.csproj", "{EE95AE39-845A-42D3-86D0-8065DBE56612}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric.Tests", "tests/System.Collections.NonGeneric.Tests.csproj", "{EE95AE39-845A-42D3-86D0-8065DBE56612}"
ProjectSection(ProjectDependencies) = postProject
{585E3764-534B-4A12-8BD5-8578CB826A45} = {585E3764-534B-4A12-8BD5-8578CB826A45}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric.Performance.Tests", "tests\Performance\System.Collections.NonGeneric.Performance.Tests.csproj", "{93AB3799-BC91-4B27-B526-28FFFF0DB1B1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric.Performance.Tests", "tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj", "{93AB3799-BC91-4B27-B526-28FFFF0DB1B1}"
ProjectSection(ProjectDependencies) = postProject
{585E3764-534B-4A12-8BD5-8578CB826A45} = {585E3764-534B-4A12-8BD5-8578CB826A45}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric", "src\System.Collections.NonGeneric.csproj", "{585E3764-534B-4A12-8BD5-8578CB826A45}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric", "src/System.Collections.NonGeneric.csproj", "{585E3764-534B-4A12-8BD5-8578CB826A45}"
ProjectSection(ProjectDependencies) = postProject
{8500112F-96BD-47BF-8871-3242089FAE70} = {8500112F-96BD-47BF-8871-3242089FAE70}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric", "ref\System.Collections.NonGeneric.csproj", "{8500112F-96BD-47BF-8871-3242089FAE70}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric", "ref/System.Collections.NonGeneric.csproj", "{8500112F-96BD-47BF-8871-3242089FAE70}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections.Specialized/System.Collections.Specialized.sln b/src/System.Collections.Specialized/System.Collections.Specialized.sln
index d5337e0221ee..f85c032fe211 100644
--- a/src/System.Collections.Specialized/System.Collections.Specialized.sln
+++ b/src/System.Collections.Specialized/System.Collections.Specialized.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized.Tests", "tests\System.Collections.Specialized.Tests.csproj", "{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized.Tests", "tests/System.Collections.Specialized.Tests.csproj", "{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}"
ProjectSection(ProjectDependencies) = postProject
{63634289-90D7-4947-8BF3-DBBE98D76C85} = {63634289-90D7-4947-8BF3-DBBE98D76C85}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized", "src\System.Collections.Specialized.csproj", "{63634289-90D7-4947-8BF3-DBBE98D76C85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized", "src/System.Collections.Specialized.csproj", "{63634289-90D7-4947-8BF3-DBBE98D76C85}"
ProjectSection(ProjectDependencies) = postProject
{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959} = {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized", "ref\System.Collections.Specialized.csproj", "{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized", "ref/System.Collections.Specialized.csproj", "{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections/System.Collections.sln b/src/System.Collections/System.Collections.sln
index f4bc3394642a..ef78901fe2f6 100644
--- a/src/System.Collections/System.Collections.sln
+++ b/src/System.Collections/System.Collections.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Tests", "tests\System.Collections.Tests.csproj", "{F5EB9630-AD29-4880-963F-F2D39C684D8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Tests", "tests/System.Collections.Tests.csproj", "{F5EB9630-AD29-4880-963F-F2D39C684D8A}"
ProjectSection(ProjectDependencies) = postProject
{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Performance.Tests", "tests\Performance\System.Collections.Performance.Tests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Performance.Tests", "tests/Performance/System.Collections.Performance.Tests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}"
ProjectSection(ProjectDependencies) = postProject
{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections", "src\System.Collections.csproj", "{D5FF747F-7A0B-9003-885A-FE9A63E755E5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections", "src/System.Collections.csproj", "{D5FF747F-7A0B-9003-885A-FE9A63E755E5}"
ProjectSection(ProjectDependencies) = postProject
{C746D448-E7C3-4850-9CA7-D3F1FA49742F} = {C746D448-E7C3-4850-9CA7-D3F1FA49742F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections", "ref\System.Collections.csproj", "{C746D448-E7C3-4850-9CA7-D3F1FA49742F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections", "ref/System.Collections.csproj", "{C746D448-E7C3-4850-9CA7-D3F1FA49742F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Collections/src/Configurations.props b/src/System.Collections/src/Configurations.props
index 04e451110437..c54630061e50 100644
--- a/src/System.Collections/src/Configurations.props
+++ b/src/System.Collections/src/Configurations.props
@@ -1,9 +1,9 @@
+
uapaot-Windows_NT;
- netcoreapp1.2corert;
netcoreapp-Windows_NT;
netcoreapp-Unix;
uap-Windows_NT;
diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj
index ed03405053b6..5c61dd12d92a 100644
--- a/src/System.Collections/src/System.Collections.csproj
+++ b/src/System.Collections/src/System.Collections.csproj
@@ -14,8 +14,6 @@
-
-
diff --git a/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
index c846e40455e4..8f4904730a16 100644
--- a/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
+++ b/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations.Tests", "tests\System.ComponentModel.Annotations.Tests.csproj", "{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations.Tests", "tests/System.ComponentModel.Annotations.Tests.csproj", "{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}"
ProjectSection(ProjectDependencies) = postProject
{4266D58F-EB60-46C2-BA81-3ABDE759A7D5} = {4266D58F-EB60-46C2-BA81-3ABDE759A7D5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations", "src\System.ComponentModel.Annotations.csproj", "{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations", "src/System.ComponentModel.Annotations.csproj", "{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}"
ProjectSection(ProjectDependencies) = postProject
{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26} = {C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations", "ref\System.ComponentModel.Annotations.csproj", "{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations", "ref/System.ComponentModel.Annotations.csproj", "{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
index 64d04d9cae1f..6afe6a3a6685 100644
--- a/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
+++ b/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync.Tests", "tests\System.ComponentModel.EventBasedAsync.Tests.csproj", "{59E9B218-81D0-4A80-A4B7-66C716136D82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync.Tests", "tests/System.ComponentModel.EventBasedAsync.Tests.csproj", "{59E9B218-81D0-4A80-A4B7-66C716136D82}"
ProjectSection(ProjectDependencies) = postProject
{551A6340-8EEF-445E-A2A2-639CC23DBD36} = {551A6340-8EEF-445E-A2A2-639CC23DBD36}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync", "src\System.ComponentModel.EventBasedAsync.csproj", "{551A6340-8EEF-445E-A2A2-639CC23DBD36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync", "src/System.ComponentModel.EventBasedAsync.csproj", "{551A6340-8EEF-445E-A2A2-639CC23DBD36}"
ProjectSection(ProjectDependencies) = postProject
{E7943063-5DB9-4EC6-86DD-3029E65121CE} = {E7943063-5DB9-4EC6-86DD-3029E65121CE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync", "ref\System.ComponentModel.EventBasedAsync.csproj", "{E7943063-5DB9-4EC6-86DD-3029E65121CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.EventBasedAsync", "ref/System.ComponentModel.EventBasedAsync.csproj", "{E7943063-5DB9-4EC6-86DD-3029E65121CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
index cd722e797e12..cadde704ae1f 100644
--- a/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
+++ b/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives.Tests", "tests\System.ComponentModel.Primitives.Tests.csproj", "{C9534425-93FB-494F-8DD8-1E4E3E626FDE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives.Tests", "tests/System.ComponentModel.Primitives.Tests.csproj", "{C9534425-93FB-494F-8DD8-1E4E3E626FDE}"
ProjectSection(ProjectDependencies) = postProject
{F620F382-30D1-451E-B125-2A612F92068B} = {F620F382-30D1-451E-B125-2A612F92068B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives", "src\System.ComponentModel.Primitives.csproj", "{F620F382-30D1-451E-B125-2A612F92068B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives", "src/System.ComponentModel.Primitives.csproj", "{F620F382-30D1-451E-B125-2A612F92068B}"
ProjectSection(ProjectDependencies) = postProject
{ECF37FA5-BEB7-4A23-A573-693B343B45C3} = {ECF37FA5-BEB7-4A23-A573-693B343B45C3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives", "ref\System.ComponentModel.Primitives.csproj", "{ECF37FA5-BEB7-4A23-A573-693B343B45C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives", "ref/System.ComponentModel.Primitives.csproj", "{ECF37FA5-BEB7-4A23-A573-693B343B45C3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
index 823bb8a6ee32..87bc170953ed 100644
--- a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
+++ b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter.Tests", "tests\System.ComponentModel.TypeConverter.Tests.csproj", "{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter.Tests", "tests/System.ComponentModel.TypeConverter.Tests.csproj", "{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}"
ProjectSection(ProjectDependencies) = postProject
{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter.Performance.Tests", "tests\Performance\System.ComponentModel.TypeConverter.Performance.Tests.csproj", "{89C76728-ECAF-4905-A33F-BD6BFED5E91D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter.Performance.Tests", "tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj", "{89C76728-ECAF-4905-A33F-BD6BFED5E91D}"
ProjectSection(ProjectDependencies) = postProject
{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter", "src\System.ComponentModel.TypeConverter.csproj", "{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter", "src/System.ComponentModel.TypeConverter.csproj", "{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}"
ProjectSection(ProjectDependencies) = postProject
{D35FD24C-1D1E-4860-B44D-73097CC0BD90} = {D35FD24C-1D1E-4860-B44D-73097CC0BD90}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter", "ref\System.ComponentModel.TypeConverter.csproj", "{D35FD24C-1D1E-4860-B44D-73097CC0BD90}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter", "ref/System.ComponentModel.TypeConverter.csproj", "{D35FD24C-1D1E-4860-B44D-73097CC0BD90}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ComponentModel/System.ComponentModel.sln b/src/System.ComponentModel/System.ComponentModel.sln
index 2d9e5ccdcc26..f5994f92e71a 100644
--- a/src/System.ComponentModel/System.ComponentModel.sln
+++ b/src/System.ComponentModel/System.ComponentModel.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Tests", "tests\System.ComponentModel.Tests.csproj", "{40C01084-DAB1-4F24-8729-85523BC9F04E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Tests", "tests/System.ComponentModel.Tests.csproj", "{40C01084-DAB1-4F24-8729-85523BC9F04E}"
ProjectSection(ProjectDependencies) = postProject
{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C} = {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel", "src\System.ComponentModel.csproj", "{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel", "src/System.ComponentModel.csproj", "{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}"
ProjectSection(ProjectDependencies) = postProject
{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF} = {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel", "ref\System.ComponentModel.csproj", "{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel", "ref/System.ComponentModel.csproj", "{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
index 7b601b011a5a..ed3bff0fe2b1 100644
--- a/src/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
+++ b/src/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.AttributedModel", "src\System.Composition.AttributedModel.csproj", "{C6257381-C624-494A-A9D9-5586E60856EA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.AttributedModel", "src/System.Composition.AttributedModel.csproj", "{C6257381-C624-494A-A9D9-5586E60856EA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Composition.Convention/System.Composition.Convention.sln b/src/System.Composition.Convention/System.Composition.Convention.sln
index a0ae890b1008..7847e1adff80 100644
--- a/src/System.Composition.Convention/System.Composition.Convention.sln
+++ b/src/System.Composition.Convention/System.Composition.Convention.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Convention.Tests", "tests\System.Composition.Convention.Tests.csproj", "{853BB14F-8A5B-42B4-A053-21DE1AEBB335}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Convention.Tests", "tests/System.Composition.Convention.Tests.csproj", "{853BB14F-8A5B-42B4-A053-21DE1AEBB335}"
ProjectSection(ProjectDependencies) = postProject
{E6592FAD-10B5-4B56-9287-D72DD136992F} = {E6592FAD-10B5-4B56-9287-D72DD136992F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Convention", "src\System.Composition.Convention.csproj", "{E6592FAD-10B5-4B56-9287-D72DD136992F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Convention", "src/System.Composition.Convention.csproj", "{E6592FAD-10B5-4B56-9287-D72DD136992F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/System.Composition.Convention/src/System.Composition.Convention.csproj
index 185abd4ffe71..4c4e1ad8c89d 100644
--- a/src/System.Composition.Convention/src/System.Composition.Convention.csproj
+++ b/src/System.Composition.Convention/src/System.Composition.Convention.csproj
@@ -5,6 +5,7 @@
{E6592FAD-10B5-4B56-9287-D72DD136992F}
Properties
System.Composition.Convention
+ $(DefineConstants);netstandard10
netstandard1.0;portable-net45+win8+wp8+wpa81
diff --git a/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs b/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs
index 1e1077c03adf..fdcafba7f20e 100644
--- a/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs
+++ b/src/System.Composition.Convention/src/System/Composition/Convention/PartConventionBuilder.cs
@@ -541,7 +541,11 @@ internal bool BuildConstructorAttributes(Type type, ref List attributes = ci.GetCustomAttributes(typeof(ImportingConstructorAttribute), false);
+#else
IEnumerable attributes = Attribute.GetCustomAttributes(ci, typeof(ImportingConstructorAttribute), false);
+#endif
if (attributes.Count() != 0)
{
CompositionTrace.Registration_ConstructorConventionOverridden(type);
diff --git a/src/System.Composition.Hosting/System.Composition.Hosting.sln b/src/System.Composition.Hosting/System.Composition.Hosting.sln
index 3daff268ac33..95387dd99b16 100644
--- a/src/System.Composition.Hosting/System.Composition.Hosting.sln
+++ b/src/System.Composition.Hosting/System.Composition.Hosting.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Hosting", "src\System.Composition.Hosting.csproj", "{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Hosting", "src/System.Composition.Hosting.csproj", "{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Composition.Runtime/System.Composition.Runtime.sln b/src/System.Composition.Runtime/System.Composition.Runtime.sln
index 60c084fc2e27..3ccbd6557e38 100644
--- a/src/System.Composition.Runtime/System.Composition.Runtime.sln
+++ b/src/System.Composition.Runtime/System.Composition.Runtime.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Runtime", "src\System.Composition.Runtime.csproj", "{2711DFD2-8541-4628-BC53-EB784A14CDCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Runtime", "src/System.Composition.Runtime.csproj", "{2711DFD2-8541-4628-BC53-EB784A14CDCF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/System.Composition.TypedParts/System.Composition.TypedParts.sln
index 455fef15ec88..4f1f19340a11 100644
--- a/src/System.Composition.TypedParts/System.Composition.TypedParts.sln
+++ b/src/System.Composition.TypedParts/System.Composition.TypedParts.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.TypedParts", "src\System.Composition.TypedParts.csproj", "{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.TypedParts", "src/System.Composition.TypedParts.csproj", "{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
index 4a4805710db1..7a7a8f174960 100644
--- a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
+++ b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
@@ -5,6 +5,7 @@
{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}
System.Composition
System.Composition.TypedParts
+ $(DefineConstants);netstandard10
netstandard1.0;portable-net45+win8+wp8+wpa81
diff --git a/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs b/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs
index 70b26521a4c6..334525617a49 100644
--- a/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs
+++ b/src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs
@@ -18,15 +18,22 @@ public override IEnumerable GetCustomAttributes(Type reflectedType, R
if (!(member is TypeInfo) && member.DeclaringType != reflectedType)
return EmptyArray.Value;
-
+#if netstandard10
+ return member.GetCustomAttributes(false);
+#else
return Attribute.GetCustomAttributes(member, false);
+#endif
}
public override IEnumerable GetCustomAttributes(Type reflectedType, Reflection.ParameterInfo parameter)
{
if (reflectedType == null) throw new ArgumentNullException(nameof(reflectedType));
if (parameter == null) throw new ArgumentNullException(nameof(parameter));
+#if netstandard10
+ return parameter.GetCustomAttributes(false);
+#else
return Attribute.GetCustomAttributes(parameter, false);
+#endif
}
}
}
diff --git a/src/System.Composition/System.Composition.sln b/src/System.Composition/System.Composition.sln
index 4b552e0af4e0..cfcc6e3044e6 100644
--- a/src/System.Composition/System.Composition.sln
+++ b/src/System.Composition/System.Composition.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Tests", "tests\System.Composition.Tests.csproj", "{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Composition.Tests", "tests/System.Composition.Tests.csproj", "{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
index c93ec8cf0935..33053f3d28ff 100644
--- a/src/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
+++ b/src/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager.Tests", "tests\System.Configuration.ConfigurationManager.Tests.csproj", "{7669C397-C21C-4C08-83F1-BE6691911E88}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager.Tests", "tests/System.Configuration.ConfigurationManager.Tests.csproj", "{7669C397-C21C-4C08-83F1-BE6691911E88}"
ProjectSection(ProjectDependencies) = postProject
{B7697463-7C98-4462-BA09-67B7BF3842B6} = {B7697463-7C98-4462-BA09-67B7BF3842B6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager", "src\System.Configuration.ConfigurationManager.csproj", "{B7697463-7C98-4462-BA09-67B7BF3842B6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager", "src/System.Configuration.ConfigurationManager.csproj", "{B7697463-7C98-4462-BA09-67B7BF3842B6}"
ProjectSection(ProjectDependencies) = postProject
{FD6AA2B9-56DB-4BCC-85E0-7727506562B0} = {FD6AA2B9-56DB-4BCC-85E0-7727506562B0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager", "ref\System.Configuration.ConfigurationManager.csproj", "{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Configuration.ConfigurationManager", "ref/System.Configuration.ConfigurationManager.csproj", "{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Console/System.Console.sln b/src/System.Console/System.Console.sln
index e6ebc4f8346f..49c701864a0b 100644
--- a/src/System.Console/System.Console.sln
+++ b/src/System.Console/System.Console.sln
@@ -2,27 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Tests", "tests\System.Console.Tests.csproj", "{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Tests", "tests/System.Console.Tests.csproj", "{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}"
ProjectSection(ProjectDependencies) = postProject
{F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Manual.Tests", "tests\ManualTests\System.Console.Manual.Tests.csproj", "{99E5069D-241F-48A6-8F29-404B4AED72BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Performance.Tests", "tests/Performance/System.Console.Performance.Tests.csproj", "{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}"
ProjectSection(ProjectDependencies) = postProject
{F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Performance.Tests", "tests\Performance\System.Console.Performance.Tests.csproj", "{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console.Manual.Tests", "tests/ManualTests/System.Console.Manual.Tests.csproj", "{99E5069D-241F-48A6-8F29-404B4AED72BF}"
ProjectSection(ProjectDependencies) = postProject
{F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console", "src\System.Console.csproj", "{F9DF2357-81B4-4317-908E-512DA9395583}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console", "src/System.Console.csproj", "{F9DF2357-81B4-4317-908E-512DA9395583}"
ProjectSection(ProjectDependencies) = postProject
{9EB75B87-2BE5-48E5-8988-A0929CE6664E} = {9EB75B87-2BE5-48E5-8988-A0929CE6664E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console", "ref\System.Console.csproj", "{9EB75B87-2BE5-48E5-8988-A0929CE6664E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Console", "ref/System.Console.csproj", "{9EB75B87-2BE5-48E5-8988-A0929CE6664E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -40,14 +40,14 @@ Global
{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.Build.0 = Release|Any CPU
{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.Build.0 = Release|Any CPU
{F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -62,8 +62,8 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {99E5069D-241F-48A6-8F29-404B4AED72BF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {99E5069D-241F-48A6-8F29-404B4AED72BF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{F9DF2357-81B4-4317-908E-512DA9395583} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{9EB75B87-2BE5-48E5-8988-A0929CE6664E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Data.Common/System.Data.Common.sln b/src/System.Data.Common/System.Data.Common.sln
index 849ecb5f5fba..1de0744b4480 100644
--- a/src/System.Data.Common/System.Data.Common.sln
+++ b/src/System.Data.Common/System.Data.Common.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common.Tests", "tests\System.Data.Common.Tests.csproj", "{B473F77D-4168-4123-932A-E88020B768FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common.Tests", "tests/System.Data.Common.Tests.csproj", "{B473F77D-4168-4123-932A-E88020B768FA}"
ProjectSection(ProjectDependencies) = postProject
{29EF8D53-8E84-4E49-B90F-5950A2FE7D54} = {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common", "src\System.Data.Common.csproj", "{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common", "src/System.Data.Common.csproj", "{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}"
ProjectSection(ProjectDependencies) = postProject
{D2DB0D6F-F65E-4174-B31E-27DC03137118} = {D2DB0D6F-F65E-4174-B31E-27DC03137118}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common", "ref\System.Data.Common.csproj", "{D2DB0D6F-F65E-4174-B31E-27DC03137118}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Common", "ref/System.Data.Common.csproj", "{D2DB0D6F-F65E-4174-B31E-27DC03137118}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Data.SqlClient/System.Data.SqlClient.sln b/src/System.Data.SqlClient/System.Data.SqlClient.sln
index 5ec8dcc0bb2a..0e910ffb178a 100644
--- a/src/System.Data.SqlClient/System.Data.SqlClient.sln
+++ b/src/System.Data.SqlClient/System.Data.SqlClient.sln
@@ -2,57 +2,57 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Tests", "tests\FunctionalTests\System.Data.SqlClient.Tests.csproj", "{F3E72F35-0351-4D67-9388-725BCAD807BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.Servers", "tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj", "{978063D3-FBB5-4E10-8C45-67C90BE1B931}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.ManualTesting.Tests", "tests\ManualTests\System.Data.SqlClient.ManualTesting.Tests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.EndPoint", "tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj", "{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IMonitorLoader", "tests\StressTests\IMonitorLoader\IMonitorLoader.csproj", "{AF78BA88-6428-47EA-8682-442DAF8E9656}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS", "tests/Tools/TDS/TDS/TDS.csproj", "{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Stress.Tests", "tests\StressTests\System.Data.SqlClient.Stress.Tests\System.Data.SqlClient.Stress.Tests.csproj", "{B94B8E6D-3E41-4046-B758-4A2E281F74EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressRunner", "tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj", "{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressFramework", "tests\StressTests\System.Data.StressFramework\System.Data.StressFramework.csproj", "{518A4E22-0144-4699-80AE-757B744E8E38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressFramework", "tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj", "{518A4E22-0144-4699-80AE-757B744E8E38}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressRunner", "tests\StressTests\System.Data.StressRunner\System.Data.StressRunner.csproj", "{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Stress.Tests", "tests/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj", "{B94B8E6D-3E41-4046-B758-4A2E281F74EE}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS", "tests\Tools\TDS\TDS\TDS.csproj", "{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IMonitorLoader", "tests/StressTests/IMonitorLoader/IMonitorLoader.csproj", "{AF78BA88-6428-47EA-8682-442DAF8E9656}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.EndPoint", "tests\Tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj", "{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.ManualTesting.Tests", "tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.Servers", "tests\Tools\TDS\TDS.Servers\TDS.Servers.csproj", "{978063D3-FBB5-4E10-8C45-67C90BE1B931}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Tests", "tests/FunctionalTests/System.Data.SqlClient.Tests.csproj", "{F3E72F35-0351-4D67-9388-725BCAD807BA}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "src\System.Data.SqlClient.csproj", "{D4550556-4745-457F-BA8F-3EBF3836D6B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "src/System.Data.SqlClient.csproj", "{D4550556-4745-457F-BA8F-3EBF3836D6B4}"
ProjectSection(ProjectDependencies) = postProject
{D58E8D2B-3331-4660-8DFB-512D66F8EC63} = {D58E8D2B-3331-4660-8DFB-512D66F8EC63}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "ref\System.Data.SqlClient.csproj", "{D58E8D2B-3331-4660-8DFB-512D66F8EC63}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "ref/System.Data.SqlClient.csproj", "{D58E8D2B-3331-4660-8DFB-512D66F8EC63}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -66,42 +66,42 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = Release|Any CPU
- {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = Release|Any CPU
- {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.Build.0 = Release|Any CPU
- {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = Release|Any CPU
- {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.Build.0 = Release|Any CPU
- {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.Build.0 = Release|Any CPU
- {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = Release|Any CPU
- {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.Build.0 = Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.Build.0 = Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.ActiveCfg = Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.Build.0 = Release|Any CPU
+ {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.Build.0 = Release|Any CPU
+ {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -115,15 +115,15 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {F3E72F35-0351-4D67-9388-725BCAD807BA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {45DB5F86-7AE3-45C6-870D-F9357B66BDB5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {AF78BA88-6428-47EA-8682-442DAF8E9656} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {B94B8E6D-3E41-4046-B758-4A2E281F74EE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {518A4E22-0144-4699-80AE-757B744E8E38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {529B187A-DE4F-4F4D-9FBB-D3D416FDB683} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {8DC9D1A0-351B-47BC-A90F-B9DA542550E9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {1FF891B4-D3DE-4CCE-887C-CB48F5351A45} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{978063D3-FBB5-4E10-8C45-67C90BE1B931} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {1FF891B4-D3DE-4CCE-887C-CB48F5351A45} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {8DC9D1A0-351B-47BC-A90F-B9DA542550E9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {518A4E22-0144-4699-80AE-757B744E8E38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {B94B8E6D-3E41-4046-B758-4A2E281F74EE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {AF78BA88-6428-47EA-8682-442DAF8E9656} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {45DB5F86-7AE3-45C6-870D-F9357B66BDB5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {F3E72F35-0351-4D67-9388-725BCAD807BA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{D58E8D2B-3331-4660-8DFB-512D66F8EC63} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
index aaa93afe619f..1bea5b5bfb41 100644
--- a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
+++ b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts.Tests", "tests\System.Diagnostics.Contracts.Tests.csproj", "{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts.Tests", "tests/System.Diagnostics.Contracts.Tests.csproj", "{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}"
ProjectSection(ProjectDependencies) = postProject
{13426B04-D1AC-4423-8519-F3EB44943B9D} = {13426B04-D1AC-4423-8519-F3EB44943B9D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts", "src\System.Diagnostics.Contracts.csproj", "{13426B04-D1AC-4423-8519-F3EB44943B9D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts", "src/System.Diagnostics.Contracts.csproj", "{13426B04-D1AC-4423-8519-F3EB44943B9D}"
ProjectSection(ProjectDependencies) = postProject
{5E0B1760-8753-467A-8B10-66B8994220DB} = {5E0B1760-8753-467A-8B10-66B8994220DB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts", "ref\System.Diagnostics.Contracts.csproj", "{5E0B1760-8753-467A-8B10-66B8994220DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts", "ref/System.Diagnostics.Contracts.csproj", "{5E0B1760-8753-467A-8B10-66B8994220DB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Diagnostics.Contracts/src/Configurations.props b/src/System.Diagnostics.Contracts/src/Configurations.props
index dcb70afd11c0..4c3df1a7d7d6 100644
--- a/src/System.Diagnostics.Contracts/src/Configurations.props
+++ b/src/System.Diagnostics.Contracts/src/Configurations.props
@@ -4,7 +4,8 @@
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
index ee8fdaca5f15..ab40fa3ff9d4 100644
--- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
+++ b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
@@ -7,12 +7,14 @@
{13426B04-D1AC-4423-8519-F3EB44943B9D}
-
-
-
-
+
+
+
+
+
+
diff --git a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
index 41f06c258082..b25422d783a2 100644
--- a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
+++ b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests.csproj", "{56F67E92-E606-435E-A00F-003CBFB26945}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug.Tests", "tests/System.Diagnostics.Debug.Tests.csproj", "{56F67E92-E606-435E-A00F-003CBFB26945}"
ProjectSection(ProjectDependencies) = postProject
{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8} = {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", "src\System.Diagnostics.Debug.csproj", "{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", "src/System.Diagnostics.Debug.csproj", "{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}"
ProjectSection(ProjectDependencies) = postProject
{2CBC7A79-EDF5-4552-B25D-8E32E367571E} = {2CBC7A79-EDF5-4552-B25D-8E32E367571E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", "ref\System.Diagnostics.Debug.csproj", "{2CBC7A79-EDF5-4552-B25D-8E32E367571E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", "ref/System.Diagnostics.Debug.csproj", "{2CBC7A79-EDF5-4552-B25D-8E32E367571E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.Debug/src/Configurations.props b/src/System.Diagnostics.Debug/src/Configurations.props
index e0ce1462e599..32ab90bd1f8c 100644
--- a/src/System.Diagnostics.Debug/src/Configurations.props
+++ b/src/System.Diagnostics.Debug/src/Configurations.props
@@ -1,13 +1,12 @@
+
netcoreapp-Unix;
netcoreapp-Windows_NT;
uap-Windows_NT;
uapaot-Windows_NT;
- netcoreapp1.2corert-Unix;
- netcoreapp1.2corert-Windows_NT;
\ No newline at end of file
diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
index e25b6ade8ba5..a37e7a3e0098 100644
--- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
+++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
@@ -5,7 +5,7 @@
{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}
System.Diagnostics.Debug
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
true
@@ -15,10 +15,6 @@
-
-
-
-
diff --git a/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
index 4307c7ae9087..084cba026eb8 100644
--- a/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
+++ b/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource.Tests", "tests\System.Diagnostics.DiagnosticSource.Tests.csproj", "{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource.Tests", "tests/System.Diagnostics.DiagnosticSource.Tests.csproj", "{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}"
ProjectSection(ProjectDependencies) = postProject
{F24D3391-2928-4E83-AADE-B34423498750} = {F24D3391-2928-4E83-AADE-B34423498750}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource", "src\System.Diagnostics.DiagnosticSource.csproj", "{F24D3391-2928-4E83-AADE-B34423498750}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource", "src/System.Diagnostics.DiagnosticSource.csproj", "{F24D3391-2928-4E83-AADE-B34423498750}"
ProjectSection(ProjectDependencies) = postProject
{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9} = {3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource", "ref\System.Diagnostics.DiagnosticSource.csproj", "{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.DiagnosticSource", "ref/System.Diagnostics.DiagnosticSource.csproj", "{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props b/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props
index c398e42e8994..a66f1edba4a0 100644
--- a/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props
+++ b/src/System.Diagnostics.DiagnosticSource/ref/Configurations.props
@@ -3,6 +3,7 @@
netstandard;
+ netstandard1.1;
\ No newline at end of file
diff --git a/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
index 5cb3e6418afc..cd326009af26 100644
--- a/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
@@ -7,8 +7,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
index 2919f0ed53b4..690f7ac4f93d 100644
--- a/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
+++ b/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "tests\System.Diagnostics.FileVersionInfo.TestAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.Tests", "tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj", "{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}"
ProjectSection(ProjectDependencies) = postProject
{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}"
ProjectSection(ProjectDependencies) = postProject
{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo", "src\System.Diagnostics.FileVersionInfo.csproj", "{00EDA5FD-E802-40D3-92D5-56C27612D36D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo", "src/System.Diagnostics.FileVersionInfo.csproj", "{00EDA5FD-E802-40D3-92D5-56C27612D36D}"
ProjectSection(ProjectDependencies) = postProject
{F815A563-B6B8-49F3-9E90-1A134033B864} = {F815A563-B6B8-49F3-9E90-1A134033B864}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo", "ref\System.Diagnostics.FileVersionInfo.csproj", "{F815A563-B6B8-49F3-9E90-1A134033B864}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo", "ref/System.Diagnostics.FileVersionInfo.csproj", "{F815A563-B6B8-49F3-9E90-1A134033B864}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = Release|Any CPU
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = Release|Any CPU
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {28EB14BE-3BC9-4543-ABA6-A932424DFBD0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{F815A563-B6B8-49F3-9E90-1A134033B864} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
index e403ccbf881f..f85b5efac2e9 100644
--- a/src/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
+++ b/src/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.PerformanceCounter", "ref\System.Diagnostics.PerformanceCounter.csproj", "{5BDC8641-E3EE-47B5-BE7B-2D2275402412}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.PerformanceCounter", "ref/System.Diagnostics.PerformanceCounter.csproj", "{5BDC8641-E3EE-47B5-BE7B-2D2275402412}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
EndProject
diff --git a/src/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/System.Diagnostics.Process/System.Diagnostics.Process.sln
index 9614eea5459f..f33ce06bcd50 100644
--- a/src/System.Diagnostics.Process/System.Diagnostics.Process.sln
+++ b/src/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process.Tests", "tests\System.Diagnostics.Process.Tests.csproj", "{E1114510-844C-4BB2-BBAD-8595BD16E24B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process.Tests", "tests/System.Diagnostics.Process.Tests.csproj", "{E1114510-844C-4BB2-BBAD-8595BD16E24B}"
ProjectSection(ProjectDependencies) = postProject
{F55047F8-E47B-46E3-B221-C23595AFE168} = {F55047F8-E47B-46E3-B221-C23595AFE168}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process.Performance.Tests", "tests\Performance\System.Diagnostics.Process.Performance.Tests.csproj", "{4E05E43A-1DC9-47C7-8280-13CF4EF741EA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process.Performance.Tests", "tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj", "{4E05E43A-1DC9-47C7-8280-13CF4EF741EA}"
ProjectSection(ProjectDependencies) = postProject
{F55047F8-E47B-46E3-B221-C23595AFE168} = {F55047F8-E47B-46E3-B221-C23595AFE168}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process", "src\System.Diagnostics.Process.csproj", "{F55047F8-E47B-46E3-B221-C23595AFE168}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process", "src/System.Diagnostics.Process.csproj", "{F55047F8-E47B-46E3-B221-C23595AFE168}"
ProjectSection(ProjectDependencies) = postProject
{98B33275-39D8-4997-867D-04C69C69885E} = {98B33275-39D8-4997-867D-04C69C69885E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process", "ref\System.Diagnostics.Process.csproj", "{98B33275-39D8-4997-867D-04C69C69885E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Process", "ref/System.Diagnostics.Process.csproj", "{98B33275-39D8-4997-867D-04C69C69885E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index d927a1faea7a..84f819c2656f 100644
--- a/src/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.StackTrace", "src\System.Diagnostics.StackTrace.csproj", "{02304469-722E-4723-92A1-820B9A37D275}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.StackTrace", "src/System.Diagnostics.StackTrace.csproj", "{02304469-722E-4723-92A1-820B9A37D275}"
ProjectSection(ProjectDependencies) = postProject
{C38217EF-88F4-4D56-9F58-780BE1DDAFF6} = {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.StackTrace", "ref\System.Diagnostics.StackTrace.csproj", "{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.StackTrace", "ref/System.Diagnostics.StackTrace.csproj", "{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
index 566ef0edcb03..bc4773ad0733 100644
--- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
+++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
@@ -59,7 +59,7 @@
-
+
diff --git a/src/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
index 5ba0a364c7a8..31bf9baa98f4 100644
--- a/src/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
+++ b/src/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener.Tests", "tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj", "{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener.Tests", "tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj", "{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}"
ProjectSection(ProjectDependencies) = postProject
{315929D9-D76E-47E9-BE82-C787FB3A7876} = {315929D9-D76E-47E9-BE82-C787FB3A7876}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener", "src\System.Diagnostics.TextWriterTraceListener.csproj", "{315929D9-D76E-47E9-BE82-C787FB3A7876}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener", "src/System.Diagnostics.TextWriterTraceListener.csproj", "{315929D9-D76E-47E9-BE82-C787FB3A7876}"
ProjectSection(ProjectDependencies) = postProject
{3E10948B-1753-4CD2-ABB7-7A753EEEC023} = {3E10948B-1753-4CD2-ABB7-7A753EEEC023}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener", "ref\System.Diagnostics.TextWriterTraceListener.csproj", "{3E10948B-1753-4CD2-ABB7-7A753EEEC023}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TextWriterTraceListener", "ref/System.Diagnostics.TextWriterTraceListener.csproj", "{3E10948B-1753-4CD2-ABB7-7A753EEEC023}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.Tools/System.Diagnostics.Tools.sln b/src/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
index fa8f99c07189..ebd84018aa90 100644
--- a/src/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
+++ b/src/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools.Tests", "tests\System.Diagnostics.Tools.Tests.csproj", "{41BF89E4-8C67-45A6-8044-13009E363220}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools.Tests", "tests/System.Diagnostics.Tools.Tests.csproj", "{41BF89E4-8C67-45A6-8044-13009E363220}"
ProjectSection(ProjectDependencies) = postProject
{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95} = {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools", "src\System.Diagnostics.Tools.csproj", "{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools", "src/System.Diagnostics.Tools.csproj", "{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}"
ProjectSection(ProjectDependencies) = postProject
{F3970F2E-C118-42A8-8C37-C3B99961A9F6} = {F3970F2E-C118-42A8-8C37-C3B99961A9F6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools", "ref\System.Diagnostics.Tools.csproj", "{F3970F2E-C118-42A8-8C37-C3B99961A9F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tools", "ref/System.Diagnostics.Tools.csproj", "{F3970F2E-C118-42A8-8C37-C3B99961A9F6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Diagnostics.Tools/src/Configurations.props b/src/System.Diagnostics.Tools/src/Configurations.props
index a8910ef718c7..bbb5be814ea2 100644
--- a/src/System.Diagnostics.Tools/src/Configurations.props
+++ b/src/System.Diagnostics.Tools/src/Configurations.props
@@ -3,7 +3,8 @@
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
index afc629ad0492..04f2d50e1475 100644
--- a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
+++ b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
@@ -5,18 +5,23 @@
{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}
System.Diagnostics.Tools
true
+ $(DefineConstants);SYSTEM_DIAGNOSTICS_TOOLS
-
-
+
+
+
+
-
+
+ Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs
+
-
+
\ No newline at end of file
diff --git a/src/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
index 2f59f94be82f..e6dd352788ea 100644
--- a/src/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
+++ b/src/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource.Tests", "tests\System.Diagnostics.TraceSource.Tests.csproj", "{7B32D24D-969A-4F7F-8461-B43E15E5D553}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource.Tests", "tests/System.Diagnostics.TraceSource.Tests.csproj", "{7B32D24D-969A-4F7F-8461-B43E15E5D553}"
ProjectSection(ProjectDependencies) = postProject
{5380420C-EB1D-4C53-9CFC-916578C18334} = {5380420C-EB1D-4C53-9CFC-916578C18334}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource", "src\System.Diagnostics.TraceSource.csproj", "{5380420C-EB1D-4C53-9CFC-916578C18334}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource", "src/System.Diagnostics.TraceSource.csproj", "{5380420C-EB1D-4C53-9CFC-916578C18334}"
ProjectSection(ProjectDependencies) = postProject
{6E515D9C-A5C2-4716-96A1-4716F007267D} = {6E515D9C-A5C2-4716-96A1-4716F007267D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource", "ref\System.Diagnostics.TraceSource.csproj", "{6E515D9C-A5C2-4716-96A1-4716F007267D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.TraceSource", "ref/System.Diagnostics.TraceSource.csproj", "{6E515D9C-A5C2-4716-96A1-4716F007267D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
index ac5ec596639c..691cdcc4802c 100644
--- a/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
+++ b/src/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing.Tests", "tests\System.Diagnostics.Tracing.Tests.csproj", "{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing.Tests", "tests/System.Diagnostics.Tracing.Tests.csproj", "{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}"
ProjectSection(ProjectDependencies) = postProject
{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4} = {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing", "src\System.Diagnostics.Tracing.csproj", "{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing", "src/System.Diagnostics.Tracing.csproj", "{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}"
ProjectSection(ProjectDependencies) = postProject
{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261} = {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing", "ref\System.Diagnostics.Tracing.csproj", "{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Tracing", "ref/System.Diagnostics.Tracing.csproj", "{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Diagnostics.Tracing/src/ApiCompatBaseline.net461.txt b/src/System.Diagnostics.Tracing/src/ApiCompatBaseline.net461.txt
deleted file mode 100644
index 3bd98c7d6d64..000000000000
--- a/src/System.Diagnostics.Tracing/src/ApiCompatBaseline.net461.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-TypesMustExist : Type 'System.Diagnostics.Tracing.EventCounter' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Diagnostics.Tracing.EventSource.add_EventCommandExecuted(System.EventHandler)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Diagnostics.Tracing.EventSource.remove_EventCommandExecuted(System.EventHandler)' does not exist in the implementation but it does exist in the contract.
diff --git a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
index 442e45fcc9cb..ae3d69c501ef 100644
--- a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
+++ b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
@@ -7,7 +7,7 @@
true
true
CA2002
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
diff --git a/src/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
index bccebe870008..ab426dc07e2f 100644
--- a/src/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
+++ b/src/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement.Tests", "tests\System.DirectoryServices.AccountManagement.Tests.csproj", "{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement.Tests", "tests/System.DirectoryServices.AccountManagement.Tests.csproj", "{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}"
ProjectSection(ProjectDependencies) = postProject
{879C23DC-D828-4DFB-8E92-ABBC11B71035} = {879C23DC-D828-4DFB-8E92-ABBC11B71035}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement", "src\System.DirectoryServices.AccountManagement.csproj", "{879C23DC-D828-4DFB-8E92-ABBC11B71035}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement", "src/System.DirectoryServices.AccountManagement.csproj", "{879C23DC-D828-4DFB-8E92-ABBC11B71035}"
ProjectSection(ProjectDependencies) = postProject
{404455B6-466C-4F78-9DCC-C37DCC0B75DA} = {404455B6-466C-4F78-9DCC-C37DCC0B75DA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement", "ref\System.DirectoryServices.AccountManagement.csproj", "{404455B6-466C-4F78-9DCC-C37DCC0B75DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.AccountManagement", "ref/System.DirectoryServices.AccountManagement.csproj", "{404455B6-466C-4F78-9DCC-C37DCC0B75DA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
index 098dd2d985d3..ca17c6499f80 100644
--- a/src/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
+++ b/src/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.Protocols", "src\System.DirectoryServices.Protocols.csproj", "{135980AC-4583-44EC-894E-CB3B1A481920}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.Protocols", "src/System.DirectoryServices.Protocols.csproj", "{135980AC-4583-44EC-894E-CB3B1A481920}"
ProjectSection(ProjectDependencies) = postProject
{7DEA4539-9A0D-4801-B229-3824710EBCEE} = {7DEA4539-9A0D-4801-B229-3824710EBCEE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.Protocols", "ref\System.DirectoryServices.Protocols.csproj", "{7DEA4539-9A0D-4801-B229-3824710EBCEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.Protocols", "ref/System.DirectoryServices.Protocols.csproj", "{7DEA4539-9A0D-4801-B229-3824710EBCEE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.DirectoryServices/System.DirectoryServices.sln b/src/System.DirectoryServices/System.DirectoryServices.sln
index ca55bc1496c0..ec9ff0f9c004 100644
--- a/src/System.DirectoryServices/System.DirectoryServices.sln
+++ b/src/System.DirectoryServices/System.DirectoryServices.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices", "src\System.DirectoryServices.csproj", "{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices", "src/System.DirectoryServices.csproj", "{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}"
ProjectSection(ProjectDependencies) = postProject
{CBCDA53B-4C01-4267-B08C-413205FE4D8D} = {CBCDA53B-4C01-4267-B08C-413205FE4D8D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices", "ref\System.DirectoryServices.csproj", "{CBCDA53B-4C01-4267-B08C-413205FE4D8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices", "ref/System.DirectoryServices.csproj", "{CBCDA53B-4C01-4267-B08C-413205FE4D8D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
index 0404b31543ba..05c23f034cbd 100644
--- a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{297A9116-1005-499D-A895-2063D03E4C94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives.Tests", "tests/System.Drawing.Primitives.Tests.csproj", "{297A9116-1005-499D-A895-2063D03E4C94}"
ProjectSection(ProjectDependencies) = postProject
{8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {8F472B93-574C-4AEC-9D28-6C2360A55BBF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives.csproj", "{8F472B93-574C-4AEC-9D28-6C2360A55BBF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src/System.Drawing.Primitives.csproj", "{8F472B93-574C-4AEC-9D28-6C2360A55BBF}"
ProjectSection(ProjectDependencies) = postProject
{10F74537-6423-48F5-A7F3-4DE94E42AF8F} = {10F74537-6423-48F5-A7F3-4DE94E42AF8F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "ref\System.Drawing.Primitives.csproj", "{10F74537-6423-48F5-A7F3-4DE94E42AF8F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "ref/System.Drawing.Primitives.csproj", "{10F74537-6423-48F5-A7F3-4DE94E42AF8F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Dynamic.Runtime/System.Dynamic.Runtime.sln b/src/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
index 9b5fad7c0fca..2ac2386994c8 100644
--- a/src/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
+++ b/src/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests.csproj", "{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime.Tests", "tests/System.Dynamic.Runtime.Tests.csproj", "{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}"
ProjectSection(ProjectDependencies) = postProject
{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39} = {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime", "src\System.Dynamic.Runtime.csproj", "{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime", "src/System.Dynamic.Runtime.csproj", "{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}"
ProjectSection(ProjectDependencies) = postProject
{4E604291-4118-4CD6-B790-BA5F4F8C1A18} = {4E604291-4118-4CD6-B790-BA5F4F8C1A18}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime", "ref\System.Dynamic.Runtime.csproj", "{4E604291-4118-4CD6-B790-BA5F4F8C1A18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Dynamic.Runtime", "ref/System.Dynamic.Runtime.csproj", "{4E604291-4118-4CD6-B790-BA5F4F8C1A18}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/System.Globalization.Calendars/System.Globalization.Calendars.sln
index b6dac2a9daa0..f0e0f07b10bc 100644
--- a/src/System.Globalization.Calendars/System.Globalization.Calendars.sln
+++ b/src/System.Globalization.Calendars/System.Globalization.Calendars.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars.Tests", "tests\System.Globalization.Calendars.Tests.csproj", "{66BE33BB-790D-4D0C-9336-E073001CBD15}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars.Tests", "tests/System.Globalization.Calendars.Tests.csproj", "{66BE33BB-790D-4D0C-9336-E073001CBD15}"
ProjectSection(ProjectDependencies) = postProject
{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E} = {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars", "src\System.Globalization.Calendars.csproj", "{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars", "src/System.Globalization.Calendars.csproj", "{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}"
ProjectSection(ProjectDependencies) = postProject
{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647} = {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars", "ref\System.Globalization.Calendars.csproj", "{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Calendars", "ref/System.Globalization.Calendars.csproj", "{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Globalization.Calendars/src/Configurations.props b/src/System.Globalization.Calendars/src/Configurations.props
index a8910ef718c7..bbb5be814ea2 100644
--- a/src/System.Globalization.Calendars/src/Configurations.props
+++ b/src/System.Globalization.Calendars/src/Configurations.props
@@ -3,7 +3,8 @@
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
index 3a06c9c6e279..b9480a36dd01 100644
--- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
+++ b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
@@ -7,8 +7,10 @@
{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}
-
-
+
+
+
+
diff --git a/src/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/System.Globalization.Extensions/System.Globalization.Extensions.sln
index 7db743283b9f..0016f3d757f9 100644
--- a/src/System.Globalization.Extensions/System.Globalization.Extensions.sln
+++ b/src/System.Globalization.Extensions/System.Globalization.Extensions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests.csproj", "{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions.Tests", "tests/System.Globalization.Extensions.Tests.csproj", "{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}"
ProjectSection(ProjectDependencies) = postProject
{2B96AA10-84C0-4927-8611-8D2474B990E8} = {2B96AA10-84C0-4927-8611-8D2474B990E8}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions", "src\System.Globalization.Extensions.csproj", "{2B96AA10-84C0-4927-8611-8D2474B990E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions", "src/System.Globalization.Extensions.csproj", "{2B96AA10-84C0-4927-8611-8D2474B990E8}"
ProjectSection(ProjectDependencies) = postProject
{3634FAA3-A33E-406A-94EE-5611C6CC2810} = {3634FAA3-A33E-406A-94EE-5611C6CC2810}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions", "ref\System.Globalization.Extensions.csproj", "{3634FAA3-A33E-406A-94EE-5611C6CC2810}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions", "ref/System.Globalization.Extensions.csproj", "{3634FAA3-A33E-406A-94EE-5611C6CC2810}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Globalization/System.Globalization.sln b/src/System.Globalization/System.Globalization.sln
index b15a17efea97..09c9387b31e2 100644
--- a/src/System.Globalization/System.Globalization.sln
+++ b/src/System.Globalization/System.Globalization.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Tests", "tests\System.Globalization.Tests.csproj", "{9A8926D9-1D4C-4069-8965-A626F6CA8C29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Tests", "tests/System.Globalization.Tests.csproj", "{9A8926D9-1D4C-4069-8965-A626F6CA8C29}"
ProjectSection(ProjectDependencies) = postProject
{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Performance.Tests", "tests\Performance\System.Globalization.Performance.Tests.csproj", "{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Performance.Tests", "tests/Performance/System.Globalization.Performance.Tests.csproj", "{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}"
ProjectSection(ProjectDependencies) = postProject
{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization", "src\System.Globalization.csproj", "{2395E8CA-73CB-40DF-BE40-A60BC189B737}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization", "src/System.Globalization.csproj", "{2395E8CA-73CB-40DF-BE40-A60BC189B737}"
ProjectSection(ProjectDependencies) = postProject
{E1E58C98-808F-4065-9C1D-E6411166AF6F} = {E1E58C98-808F-4065-9C1D-E6411166AF6F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization", "ref\System.Globalization.csproj", "{E1E58C98-808F-4065-9C1D-E6411166AF6F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization", "ref/System.Globalization.csproj", "{E1E58C98-808F-4065-9C1D-E6411166AF6F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -39,10 +39,10 @@ Global
{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}.Release|Any CPU.Build.0 = Release|Any CPU
- {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Globalization/src/Configurations.props b/src/System.Globalization/src/Configurations.props
index dcb70afd11c0..4c3df1a7d7d6 100644
--- a/src/System.Globalization/src/Configurations.props
+++ b/src/System.Globalization/src/Configurations.props
@@ -4,7 +4,8 @@
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj
index 5b3f4dd323c9..95e24a8530e3 100644
--- a/src/System.Globalization/src/System.Globalization.csproj
+++ b/src/System.Globalization/src/System.Globalization.csproj
@@ -7,8 +7,10 @@
{2395E8CA-73CB-40DF-BE40-A60BC189B737}
-
-
+
+
+
+
diff --git a/src/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln b/src/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
index 152f7d0ecc57..f3f18bca0c60 100644
--- a/src/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
+++ b/src/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile.Tests", "tests\System.IO.Compression.ZipFile.Tests.csproj", "{775727A6-DF41-4160-A7FD-180279A653C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile.Tests", "tests/System.IO.Compression.ZipFile.Tests.csproj", "{775727A6-DF41-4160-A7FD-180279A653C7}"
ProjectSection(ProjectDependencies) = postProject
{ACF967ED-7FC9-435C-B2C9-306626B7B6C6} = {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile", "src\System.IO.Compression.ZipFile.csproj", "{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile", "src/System.IO.Compression.ZipFile.csproj", "{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}"
ProjectSection(ProjectDependencies) = postProject
{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29} = {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile", "ref\System.IO.Compression.ZipFile.csproj", "{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.ZipFile", "ref/System.IO.Compression.ZipFile.csproj", "{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Compression/System.IO.Compression.sln b/src/System.IO.Compression/System.IO.Compression.sln
index cb10cd5c3414..c885110b88bc 100644
--- a/src/System.IO.Compression/System.IO.Compression.sln
+++ b/src/System.IO.Compression/System.IO.Compression.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Tests", "tests/System.IO.Compression.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}"
ProjectSection(ProjectDependencies) = postProject
{5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Performance.Tests", "tests\Performance\System.IO.Compression.Performance.Tests.csproj", "{1341F8C8-637A-49A1-BE0F-13867A634929}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.Performance.Tests", "tests/Performance/System.IO.Compression.Performance.Tests.csproj", "{1341F8C8-637A-49A1-BE0F-13867A634929}"
ProjectSection(ProjectDependencies) = postProject
{5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "src\System.IO.Compression.csproj", "{5471BFE8-8071-466F-838E-5ADAA779E742}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "src/System.IO.Compression.csproj", "{5471BFE8-8071-466F-838E-5ADAA779E742}"
ProjectSection(ProjectDependencies) = postProject
{4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {4ADD9456-A929-4254-B8A2-16FC628ABFDA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "ref\System.IO.Compression.csproj", "{4ADD9456-A929-4254-B8A2-16FC628ABFDA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression", "ref/System.IO.Compression.csproj", "{4ADD9456-A929-4254-B8A2-16FC628ABFDA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln b/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
index 0dca71f83952..a61df444f6be 100644
--- a/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
+++ b/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl.Tests", "tests\System.IO.FileSystem.AccessControl.Tests.csproj", "{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl.Tests", "tests/System.IO.FileSystem.AccessControl.Tests.csproj", "{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}"
ProjectSection(ProjectDependencies) = postProject
{D77FBA6C-1AA6-45A4-93E2-97A370672C53} = {D77FBA6C-1AA6-45A4-93E2-97A370672C53}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl", "src\System.IO.FileSystem.AccessControl.csproj", "{D77FBA6C-1AA6-45A4-93E2-97A370672C53}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl", "src/System.IO.FileSystem.AccessControl.csproj", "{D77FBA6C-1AA6-45A4-93E2-97A370672C53}"
ProjectSection(ProjectDependencies) = postProject
{88A04AB0-F61E-4DD2-9E12-928DCA261263} = {88A04AB0-F61E-4DD2-9E12-928DCA261263}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl", "ref\System.IO.FileSystem.AccessControl.csproj", "{88A04AB0-F61E-4DD2-9E12-928DCA261263}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.AccessControl", "ref/System.IO.FileSystem.AccessControl.csproj", "{88A04AB0-F61E-4DD2-9E12-928DCA261263}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln b/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
index 2ecc25e25145..d292def47b73 100644
--- a/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
+++ b/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo.Tests", "tests\System.IO.FileSystem.DriveInfo.Tests.csproj", "{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo.Tests", "tests/System.IO.FileSystem.DriveInfo.Tests.csproj", "{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}"
ProjectSection(ProjectDependencies) = postProject
{29C14AD7-DC03-45DC-897D-8DACC762707E} = {29C14AD7-DC03-45DC-897D-8DACC762707E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo", "src\System.IO.FileSystem.DriveInfo.csproj", "{29C14AD7-DC03-45DC-897D-8DACC762707E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo", "src/System.IO.FileSystem.DriveInfo.csproj", "{29C14AD7-DC03-45DC-897D-8DACC762707E}"
ProjectSection(ProjectDependencies) = postProject
{48CD5889-4CB2-42C2-A61C-8ECA3B267584} = {48CD5889-4CB2-42C2-A61C-8ECA3B267584}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo", "ref\System.IO.FileSystem.DriveInfo.csproj", "{48CD5889-4CB2-42C2-A61C-8ECA3B267584}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.DriveInfo", "ref/System.IO.FileSystem.DriveInfo.csproj", "{48CD5889-4CB2-42C2-A61C-8ECA3B267584}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln b/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
index ca260f320d24..b7b572211d67 100644
--- a/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
+++ b/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests.csproj", "{2EF7EFA5-F171-4CAB-8A29-32833949FD87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives.Tests", "tests/System.IO.FileSystem.Primitives.Tests.csproj", "{2EF7EFA5-F171-4CAB-8A29-32833949FD87}"
ProjectSection(ProjectDependencies) = postProject
{6C05678E-394C-4CFF-B453-A18E28C8F2C3} = {6C05678E-394C-4CFF-B453-A18E28C8F2C3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives", "src\System.IO.FileSystem.Primitives.csproj", "{6C05678E-394C-4CFF-B453-A18E28C8F2C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives", "src/System.IO.FileSystem.Primitives.csproj", "{6C05678E-394C-4CFF-B453-A18E28C8F2C3}"
ProjectSection(ProjectDependencies) = postProject
{45201E24-47CD-47AE-9350-B48C3FBE74EC} = {45201E24-47CD-47AE-9350-B48C3FBE74EC}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives", "ref\System.IO.FileSystem.Primitives.csproj", "{45201E24-47CD-47AE-9350-B48C3FBE74EC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives", "ref/System.IO.FileSystem.Primitives.csproj", "{45201E24-47CD-47AE-9350-B48C3FBE74EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln b/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
index dfe91b95f66a..e99ca7230277 100644
--- a/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
+++ b/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{20411A66-C7A4-4941-8FA2-66308365FD22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher.Tests", "tests/System.IO.FileSystem.Watcher.Tests.csproj", "{20411A66-C7A4-4941-8FA2-66308365FD22}"
ProjectSection(ProjectDependencies) = postProject
{77E702D9-C6D8-4CE4-9941-D3056C3CCBED} = {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher", "src\System.IO.FileSystem.Watcher.csproj", "{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher", "src/System.IO.FileSystem.Watcher.csproj", "{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}"
ProjectSection(ProjectDependencies) = postProject
{34E2C0E2-6C09-427D-BB75-702B3388CFC5} = {34E2C0E2-6C09-427D-BB75-702B3388CFC5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher", "ref\System.IO.FileSystem.Watcher.csproj", "{34E2C0E2-6C09-427D-BB75-702B3388CFC5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher", "ref/System.IO.FileSystem.Watcher.csproj", "{34E2C0E2-6C09-427D-BB75-702B3388CFC5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.FileSystem/System.IO.FileSystem.sln b/src/System.IO.FileSystem/System.IO.FileSystem.sln
index e2b62ddfb77f..cfe05364d741 100644
--- a/src/System.IO.FileSystem/System.IO.FileSystem.sln
+++ b/src/System.IO.FileSystem/System.IO.FileSystem.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests.csproj", "{F0D49126-6A1C-42D5-9428-4374C868BAF8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Tests", "tests/System.IO.FileSystem.Tests.csproj", "{F0D49126-6A1C-42D5-9428-4374C868BAF8}"
ProjectSection(ProjectDependencies) = postProject
{1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {1B528B61-14F9-4BFC-A79A-F0BDB3339150}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Performance.Tests", "tests\Performance\System.IO.FileSystem.Performance.Tests.csproj", "{3C42F714-82AF-4A43-9B9C-744DE31B5C5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Performance.Tests", "tests/Performance/System.IO.FileSystem.Performance.Tests.csproj", "{3C42F714-82AF-4A43-9B9C-744DE31B5C5D}"
ProjectSection(ProjectDependencies) = postProject
{1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {1B528B61-14F9-4BFC-A79A-F0BDB3339150}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem", "src\System.IO.FileSystem.csproj", "{1B528B61-14F9-4BFC-A79A-F0BDB3339150}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem", "src/System.IO.FileSystem.csproj", "{1B528B61-14F9-4BFC-A79A-F0BDB3339150}"
ProjectSection(ProjectDependencies) = postProject
{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482} = {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem", "ref\System.IO.FileSystem.csproj", "{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem", "ref/System.IO.FileSystem.csproj", "{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
index 83100c8d2933..312a3b00ec91 100644
--- a/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
+++ b/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage.Tests", "tests\System.IO.IsolatedStorage.Tests.csproj", "{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage.Tests", "tests/System.IO.IsolatedStorage.Tests.csproj", "{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}"
ProjectSection(ProjectDependencies) = postProject
{FAF5D1E4-BA43-4663-8429-C069066D75CB} = {FAF5D1E4-BA43-4663-8429-C069066D75CB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage", "src\System.IO.IsolatedStorage.csproj", "{FAF5D1E4-BA43-4663-8429-C069066D75CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage", "src/System.IO.IsolatedStorage.csproj", "{FAF5D1E4-BA43-4663-8429-C069066D75CB}"
ProjectSection(ProjectDependencies) = postProject
{750200D5-661A-42AA-9E1F-2A151F5AEE74} = {750200D5-661A-42AA-9E1F-2A151F5AEE74}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage", "ref\System.IO.IsolatedStorage.csproj", "{750200D5-661A-42AA-9E1F-2A151F5AEE74}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.IsolatedStorage", "ref/System.IO.IsolatedStorage.csproj", "{750200D5-661A-42AA-9E1F-2A151F5AEE74}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
index d3c02b179a26..6f7e24e631e7 100644
--- a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
+++ b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles.Tests", "tests\System.IO.MemoryMappedFiles.Tests.csproj", "{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles.Tests", "tests/System.IO.MemoryMappedFiles.Tests.csproj", "{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}"
ProjectSection(ProjectDependencies) = postProject
{16EE5522-F387-4C9E-9EF2-B5134B043F37} = {16EE5522-F387-4C9E-9EF2-B5134B043F37}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles.Performance.Tests", "tests\Performance\System.IO.MemoryMappedFiles.Performance.Tests.csproj", "{41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles.Performance.Tests", "tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj", "{41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}"
ProjectSection(ProjectDependencies) = postProject
{16EE5522-F387-4C9E-9EF2-B5134B043F37} = {16EE5522-F387-4C9E-9EF2-B5134B043F37}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles", "src\System.IO.MemoryMappedFiles.csproj", "{16EE5522-F387-4C9E-9EF2-B5134B043F37}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles", "src/System.IO.MemoryMappedFiles.csproj", "{16EE5522-F387-4C9E-9EF2-B5134B043F37}"
ProjectSection(ProjectDependencies) = postProject
{F2740000-E771-4E54-9287-5A1FDF8872F4} = {F2740000-E771-4E54-9287-5A1FDF8872F4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles", "ref\System.IO.MemoryMappedFiles.csproj", "{F2740000-E771-4E54-9287-5A1FDF8872F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedFiles", "ref/System.IO.MemoryMappedFiles.csproj", "{F2740000-E771-4E54-9287-5A1FDF8872F4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Packaging/System.IO.Packaging.sln b/src/System.IO.Packaging/System.IO.Packaging.sln
index 2a2584639c12..02407c88add9 100644
--- a/src/System.IO.Packaging/System.IO.Packaging.sln
+++ b/src/System.IO.Packaging/System.IO.Packaging.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging.Tests", "tests\System.IO.Packaging.Tests.csproj", "{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging.Tests", "tests/System.IO.Packaging.Tests.csproj", "{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}"
ProjectSection(ProjectDependencies) = postProject
{1F827C19-6023-48D3-909F-9F43AB42FAF0} = {1F827C19-6023-48D3-909F-9F43AB42FAF0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging", "src\System.IO.Packaging.csproj", "{1F827C19-6023-48D3-909F-9F43AB42FAF0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging", "src/System.IO.Packaging.csproj", "{1F827C19-6023-48D3-909F-9F43AB42FAF0}"
ProjectSection(ProjectDependencies) = postProject
{4DD91348-1D1F-4964-B5CB-047D916E79EE} = {4DD91348-1D1F-4964-B5CB-047D916E79EE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging", "ref\System.IO.Packaging.csproj", "{4DD91348-1D1F-4964-B5CB-047D916E79EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Packaging", "ref/System.IO.Packaging.csproj", "{4DD91348-1D1F-4964-B5CB-047D916E79EE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Packaging/ref/Configurations.props b/src/System.IO.Packaging/ref/Configurations.props
index c398e42e8994..b2db63711061 100644
--- a/src/System.IO.Packaging/ref/Configurations.props
+++ b/src/System.IO.Packaging/ref/Configurations.props
@@ -2,6 +2,7 @@
+ netstandard1.3;
netstandard;
diff --git a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
index eb8f10be8697..61848052d68f 100644
--- a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
+++ b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
@@ -6,8 +6,16 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj
index fdbded2ace67..4163735aac50 100644
--- a/src/System.IO.Packaging/src/System.IO.Packaging.csproj
+++ b/src/System.IO.Packaging/src/System.IO.Packaging.csproj
@@ -26,6 +26,7 @@
+
diff --git a/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln b/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
index e1624750a0c6..752014ec4a80 100644
--- a/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
+++ b/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl.Tests", "tests\System.IO.Pipes.AccessControl.Tests.csproj", "{A0356E61-19E1-4722-A53D-5D2616E16312}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl.Tests", "tests/System.IO.Pipes.AccessControl.Tests.csproj", "{A0356E61-19E1-4722-A53D-5D2616E16312}"
ProjectSection(ProjectDependencies) = postProject
{40059634-BB03-4A6F-8657-CCE2D376BC8B} = {40059634-BB03-4A6F-8657-CCE2D376BC8B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl", "src\System.IO.Pipes.AccessControl.csproj", "{40059634-BB03-4A6F-8657-CCE2D376BC8B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl", "src/System.IO.Pipes.AccessControl.csproj", "{40059634-BB03-4A6F-8657-CCE2D376BC8B}"
ProjectSection(ProjectDependencies) = postProject
{994DCE47-4CF6-479D-AB1D-4EA6A2809C34} = {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl", "ref\System.IO.Pipes.AccessControl.csproj", "{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.AccessControl", "ref/System.IO.Pipes.AccessControl.csproj", "{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Pipes/System.IO.Pipes.sln b/src/System.IO.Pipes/System.IO.Pipes.sln
index 573c02518048..8d60890a2f91 100644
--- a/src/System.IO.Pipes/System.IO.Pipes.sln
+++ b/src/System.IO.Pipes/System.IO.Pipes.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.Tests", "tests\System.IO.Pipes.Tests.csproj", "{142469EC-D665-4FE2-845A-FDA69F9CC557}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.Tests", "tests/System.IO.Pipes.Tests.csproj", "{142469EC-D665-4FE2-845A-FDA69F9CC557}"
ProjectSection(ProjectDependencies) = postProject
{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.Performance.Tests", "tests\Performance\System.IO.Pipes.Performance.Tests.csproj", "{7A8B72D7-FACD-4E96-8390-F2D2FE269687}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.Performance.Tests", "tests/Performance/System.IO.Pipes.Performance.Tests.csproj", "{7A8B72D7-FACD-4E96-8390-F2D2FE269687}"
ProjectSection(ProjectDependencies) = postProject
{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes", "src\System.IO.Pipes.csproj", "{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes", "src/System.IO.Pipes.csproj", "{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}"
ProjectSection(ProjectDependencies) = postProject
{38B2B275-FB29-45C6-9E68-9ECEBC6BD874} = {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes", "ref\System.IO.Pipes.csproj", "{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes", "ref/System.IO.Pipes.csproj", "{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Ports/System.IO.Ports.sln b/src/System.IO.Ports/System.IO.Ports.sln
index e1178f7e3065..294feb5ce7a3 100644
--- a/src/System.IO.Ports/System.IO.Ports.sln
+++ b/src/System.IO.Ports/System.IO.Ports.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports.Tests", "tests\System.IO.Ports.Tests.csproj", "{4259DCE9-3480-40BB-B08A-64A2D446264B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports.Tests", "tests/System.IO.Ports.Tests.csproj", "{4259DCE9-3480-40BB-B08A-64A2D446264B}"
ProjectSection(ProjectDependencies) = postProject
{187503F4-BEF9-4369-A1B2-E3DC5D564E4E} = {187503F4-BEF9-4369-A1B2-E3DC5D564E4E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports", "src\System.IO.Ports.csproj", "{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports", "src/System.IO.Ports.csproj", "{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}"
ProjectSection(ProjectDependencies) = postProject
{75DE4259-43BB-4067-9F30-3AC920D51AEC} = {75DE4259-43BB-4067-9F30-3AC920D51AEC}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports", "ref\System.IO.Ports.csproj", "{75DE4259-43BB-4067-9F30-3AC920D51AEC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Ports", "ref/System.IO.Ports.csproj", "{75DE4259-43BB-4067-9F30-3AC920D51AEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.IO.Ports/src/Configurations.props b/src/System.IO.Ports/src/Configurations.props
index 4c7f3b60ae65..fe9ca62f0a38 100644
--- a/src/System.IO.Ports/src/Configurations.props
+++ b/src/System.IO.Ports/src/Configurations.props
@@ -3,7 +3,7 @@
netstandard-Windows_NT;
- net463-AnyOS;
+ netfx;
diff --git a/src/System.IO.Ports/src/System.IO.Ports.csproj b/src/System.IO.Ports/src/System.IO.Ports.csproj
index fca4851e9c6a..924751734bd6 100644
--- a/src/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/System.IO.Ports/src/System.IO.Ports.csproj
@@ -4,13 +4,14 @@
true
{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}
+ true
-
-
+
+
-
+
@@ -126,8 +127,11 @@
Common\Interop\Windows\Interop.BOOL.cs
-
-
+
+
+
+
+
diff --git a/src/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln b/src/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
index ff79ec4395e1..e70d36ce2ea6 100644
--- a/src/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
+++ b/src/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream.Tests", "tests\System.IO.UnmanagedMemoryStream.Tests.csproj", "{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream.Tests", "tests/System.IO.UnmanagedMemoryStream.Tests.csproj", "{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}"
ProjectSection(ProjectDependencies) = postProject
{BCF9255A-4321-4277-AD7D-F5094092C554} = {BCF9255A-4321-4277-AD7D-F5094092C554}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream", "src\System.IO.UnmanagedMemoryStream.csproj", "{BCF9255A-4321-4277-AD7D-F5094092C554}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream", "src/System.IO.UnmanagedMemoryStream.csproj", "{BCF9255A-4321-4277-AD7D-F5094092C554}"
ProjectSection(ProjectDependencies) = postProject
{C2D9E102-8E1D-4942-BA72-A55B152A5D0E} = {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream", "ref\System.IO.UnmanagedMemoryStream.csproj", "{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.UnmanagedMemoryStream", "ref/System.IO.UnmanagedMemoryStream.csproj", "{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
index 475368bbbb71..aed58fb42e46 100644
--- a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
+++ b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
@@ -4,7 +4,8 @@
uap-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
index 6bacffd74b1e..691ad4814bb0 100644
--- a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
@@ -7,8 +7,10 @@
true
-
-
+
+
+
+
diff --git a/src/System.IO/System.IO.sln b/src/System.IO/System.IO.sln
index 671aa76ab4f2..641a7d3c978b 100644
--- a/src/System.IO/System.IO.sln
+++ b/src/System.IO/System.IO.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Tests", "tests\System.IO.Tests.csproj", "{492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Tests", "tests/System.IO.Tests.csproj", "{492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}"
ProjectSection(ProjectDependencies) = postProject
{07390899-C8F6-4e83-A3A9-6867B8CB46A0} = {07390899-C8F6-4e83-A3A9-6867B8CB46A0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO", "src\System.IO.csproj", "{07390899-C8F6-4e83-A3A9-6867B8CB46A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO", "src/System.IO.csproj", "{07390899-C8F6-4e83-A3A9-6867B8CB46A0}"
ProjectSection(ProjectDependencies) = postProject
{88883C57-83BE-4E93-A363-4CFC716F248F} = {88883C57-83BE-4E93-A363-4CFC716F248F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO", "ref\System.IO.csproj", "{88883C57-83BE-4E93-A363-4CFC716F248F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO", "ref/System.IO.csproj", "{88883C57-83BE-4E93-A363-4CFC716F248F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Json/System.Json.sln b/src/System.Json/System.Json.sln
index f3f3dcc57d84..197f33575d8d 100644
--- a/src/System.Json/System.Json.sln
+++ b/src/System.Json/System.Json.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Json.Tests", "tests\System.Json.Tests.csproj", "{DC683D60-34EC-4D85-B6E0-E97FDB37A583}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Json.Tests", "tests/System.Json.Tests.csproj", "{DC683D60-34EC-4D85-B6E0-E97FDB37A583}"
ProjectSection(ProjectDependencies) = postProject
{B11B5B76-F583-44EA-A4B7-3ABD990594F6} = {B11B5B76-F583-44EA-A4B7-3ABD990594F6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Json", "src\System.Json.csproj", "{B11B5B76-F583-44EA-A4B7-3ABD990594F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Json", "src/System.Json.csproj", "{B11B5B76-F583-44EA-A4B7-3ABD990594F6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Linq.Expressions/System.Linq.Expressions.sln b/src/System.Linq.Expressions/System.Linq.Expressions.sln
index 4410698f7a02..eb78b8eb783e 100644
--- a/src/System.Linq.Expressions/System.Linq.Expressions.sln
+++ b/src/System.Linq.Expressions/System.Linq.Expressions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions.Tests", "tests\System.Linq.Expressions.Tests.csproj", "{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions.Tests", "tests/System.Linq.Expressions.Tests.csproj", "{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}"
ProjectSection(ProjectDependencies) = postProject
{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787} = {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions", "src\System.Linq.Expressions.csproj", "{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions", "src/System.Linq.Expressions.csproj", "{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}"
ProjectSection(ProjectDependencies) = postProject
{33B6ACE2-0B53-4054-8BF6-482F9E0E9427} = {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions", "ref\System.Linq.Expressions.csproj", "{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Expressions", "ref/System.Linq.Expressions.csproj", "{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Linq.Parallel/System.Linq.Parallel.sln b/src/System.Linq.Parallel/System.Linq.Parallel.sln
index e1a95fd44d46..1ba16d838427 100644
--- a/src/System.Linq.Parallel/System.Linq.Parallel.sln
+++ b/src/System.Linq.Parallel/System.Linq.Parallel.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel.Tests", "tests\System.Linq.Parallel.Tests.csproj", "{A7074928-82C3-4739-88FE-9B528977950C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel.Tests", "tests/System.Linq.Parallel.Tests.csproj", "{A7074928-82C3-4739-88FE-9B528977950C}"
ProjectSection(ProjectDependencies) = postProject
{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} = {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel", "src\System.Linq.Parallel.csproj", "{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel", "src/System.Linq.Parallel.csproj", "{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}"
ProjectSection(ProjectDependencies) = postProject
{670405FE-3828-436E-A668-A0F0B88B57A4} = {670405FE-3828-436E-A668-A0F0B88B57A4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel", "ref\System.Linq.Parallel.csproj", "{670405FE-3828-436E-A668-A0F0B88B57A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel", "ref/System.Linq.Parallel.csproj", "{670405FE-3828-436E-A668-A0F0B88B57A4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Linq.Queryable/System.Linq.Queryable.sln b/src/System.Linq.Queryable/System.Linq.Queryable.sln
index 5aeee6c2356e..f15335b647f9 100644
--- a/src/System.Linq.Queryable/System.Linq.Queryable.sln
+++ b/src/System.Linq.Queryable/System.Linq.Queryable.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable.Tests", "tests\System.Linq.Queryable.Tests.csproj", "{7B88D79B-B799-4116-A7D0-AED572540CD4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable.Tests", "tests/System.Linq.Queryable.Tests.csproj", "{7B88D79B-B799-4116-A7D0-AED572540CD4}"
ProjectSection(ProjectDependencies) = postProject
{BE12B753-C130-4B68-86E3-877F1AEE52C0} = {BE12B753-C130-4B68-86E3-877F1AEE52C0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable", "src\System.Linq.Queryable.csproj", "{BE12B753-C130-4B68-86E3-877F1AEE52C0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable", "src/System.Linq.Queryable.csproj", "{BE12B753-C130-4B68-86E3-877F1AEE52C0}"
ProjectSection(ProjectDependencies) = postProject
{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB} = {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable", "ref\System.Linq.Queryable.csproj", "{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Queryable", "ref/System.Linq.Queryable.csproj", "{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Linq/System.Linq.sln b/src/System.Linq/System.Linq.sln
index 5fd623d4f613..9e7a49724954 100644
--- a/src/System.Linq/System.Linq.sln
+++ b/src/System.Linq/System.Linq.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Tests", "tests\System.Linq.Tests.csproj", "{7C70BB15-870B-4946-8098-625DACD645A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Tests", "tests/System.Linq.Tests.csproj", "{7C70BB15-870B-4946-8098-625DACD645A6}"
ProjectSection(ProjectDependencies) = postProject
{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Performance.Tests", "tests\Performance\System.Linq.Performance.Tests.csproj", "{28FB26C9-E425-4E50-9D1D-08F34560E86E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Performance.Tests", "tests/Performance/System.Linq.Performance.Tests.csproj", "{28FB26C9-E425-4E50-9D1D-08F34560E86E}"
ProjectSection(ProjectDependencies) = postProject
{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq", "src\System.Linq.csproj", "{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq", "src/System.Linq.csproj", "{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}"
ProjectSection(ProjectDependencies) = postProject
{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81} = {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq", "ref\System.Linq.csproj", "{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq", "ref/System.Linq.csproj", "{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Memory/System.Memory.sln b/src/System.Memory/System.Memory.sln
index f19ba8b3618c..fbc56ce367c1 100644
--- a/src/System.Memory/System.Memory.sln
+++ b/src/System.Memory/System.Memory.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory.Tests", "tests\System.Memory.Tests.csproj", "{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory.Tests", "tests/System.Memory.Tests.csproj", "{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}"
ProjectSection(ProjectDependencies) = postProject
{4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory.Performance.Tests", "tests\Performance\System.Memory.Performance.Tests.csproj", "{18482C55-6B57-41E8-BBC4-383B9E2C7AA2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory.Performance.Tests", "tests/Performance/System.Memory.Performance.Tests.csproj", "{18482C55-6B57-41E8-BBC4-383B9E2C7AA2}"
ProjectSection(ProjectDependencies) = postProject
{4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory", "src\System.Memory.csproj", "{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory", "src/System.Memory.csproj", "{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}"
ProjectSection(ProjectDependencies) = postProject
{E883935B-D8FD-4FC9-A189-9D9E7F7EF550} = {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory", "ref\System.Memory.csproj", "{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Memory", "ref/System.Memory.csproj", "{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Memory/ref/Configurations.props b/src/System.Memory/ref/Configurations.props
index c398e42e8994..129adad32f9c 100644
--- a/src/System.Memory/ref/Configurations.props
+++ b/src/System.Memory/ref/Configurations.props
@@ -3,6 +3,7 @@
netstandard;
+ netstandard1.0;
\ No newline at end of file
diff --git a/src/System.Memory/ref/System.Memory.csproj b/src/System.Memory/ref/System.Memory.csproj
index 5d4aed70a738..3d399b0d9dc3 100644
--- a/src/System.Memory/ref/System.Memory.csproj
+++ b/src/System.Memory/ref/System.Memory.csproj
@@ -8,8 +8,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/System.Memory/src/System/Span.cs b/src/System.Memory/src/System/Span.cs
index 05104da506e9..bc458ef4eacf 100644
--- a/src/System.Memory/src/System/Span.cs
+++ b/src/System.Memory/src/System/Span.cs
@@ -541,6 +541,10 @@ public ref T DangerousGetPinnableReference()
private readonly int _length;
}
+ ///
+ /// Span represents a contiguous region of arbitrary memory. Unlike arrays, it can point to either managed
+ /// or native memory, or to memory allocated on the stack. It is type- and memory-safe.
+ ///
public static class Span
{
///
diff --git a/src/System.Net.Http.Rtc/System.Net.Http.Rtc.sln b/src/System.Net.Http.Rtc/System.Net.Http.Rtc.sln
index c6141645ed65..89f95f5590d0 100644
--- a/src/System.Net.Http.Rtc/System.Net.Http.Rtc.sln
+++ b/src/System.Net.Http.Rtc/System.Net.Http.Rtc.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Rtc", "src\System.Net.Http.Rtc.csproj", "{06A88496-DE20-4EDF-B694-C4B2FE38D5DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Rtc", "src/System.Net.Http.Rtc.csproj", "{06A88496-DE20-4EDF-B694-C4B2FE38D5DC}"
ProjectSection(ProjectDependencies) = postProject
{45F02E74-C3B5-4751-8938-CBCEFE10FB93} = {45F02E74-C3B5-4751-8938-CBCEFE10FB93}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Rtc", "ref\System.Net.Http.Rtc.csproj", "{45F02E74-C3B5-4751-8938-CBCEFE10FB93}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Rtc", "ref/System.Net.Http.Rtc.csproj", "{45F02E74-C3B5-4751-8938-CBCEFE10FB93}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
@@ -19,10 +19,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Debug|Any CPU.ActiveCfg = netcore50-Windows_NT-Debug|Any CPU
- {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Debug|Any CPU.Build.0 = netcore50-Windows_NT-Debug|Any CPU
- {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Release|Any CPU.ActiveCfg = netcore50-Windows_NT-Release|Any CPU
- {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Release|Any CPU.Build.0 = netcore50-Windows_NT-Release|Any CPU
+ {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Debug|Any CPU.ActiveCfg = uap-Windows_NT-Debug|Any CPU
+ {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Debug|Any CPU.Build.0 = uap-Windows_NT-Debug|Any CPU
+ {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Release|Any CPU.ActiveCfg = uap-Windows_NT-Release|Any CPU
+ {06A88496-DE20-4EDF-B694-C4B2FE38D5DC}.Release|Any CPU.Build.0 = uap-Windows_NT-Release|Any CPU
{45F02E74-C3B5-4751-8938-CBCEFE10FB93}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{45F02E74-C3B5-4751-8938-CBCEFE10FB93}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{45F02E74-C3B5-4751-8938-CBCEFE10FB93}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Net.Http.Rtc/src/Configurations.props b/src/System.Net.Http.Rtc/src/Configurations.props
index 7032ace60c93..0f1f50d3ec47 100644
--- a/src/System.Net.Http.Rtc/src/Configurations.props
+++ b/src/System.Net.Http.Rtc/src/Configurations.props
@@ -2,7 +2,6 @@
- netcore50-Windows_NT;
uapaot-Windows_NT;
uap-Windows_NT;
diff --git a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
index 7ddf43791998..0990ce23a9c5 100644
--- a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
+++ b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
@@ -5,8 +5,6 @@
{06A88496-DE20-4EDF-B694-C4B2FE38D5DC}
-
-
diff --git a/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index c61668646d5c..69f662a299dd 100644
--- a/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
+++ b/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
ProjectSection(ProjectDependencies) = postProject
{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
ProjectSection(ProjectDependencies) = postProject
{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "src\System.Net.Http.WinHttpHandler.csproj", "{F75E3008-0562-42DF-BE72-C1384F12157E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "src/System.Net.Http.WinHttpHandler.csproj", "{F75E3008-0562-42DF-BE72-C1384F12157E}"
ProjectSection(ProjectDependencies) = postProject
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "ref\System.Net.Http.WinHttpHandler.csproj", "{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.WinHttpHandler", "ref/System.Net.Http.WinHttpHandler.csproj", "{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
- {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
- {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
- {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
+ {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
+ {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
+ {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
+ {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{A2ECDEDB-12B7-402C-9230-152B7601179F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{F75E3008-0562-42DF-BE72-C1384F12157E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.Http.WinHttpHandler/src/Configurations.props b/src/System.Net.Http.WinHttpHandler/src/Configurations.props
index e9914bfd8e61..2ae1f7141e4e 100644
--- a/src/System.Net.Http.WinHttpHandler/src/Configurations.props
+++ b/src/System.Net.Http.WinHttpHandler/src/Configurations.props
@@ -2,11 +2,8 @@
- netstandard1.3-Windows_NT;
- netstandard1.3-Unix;
netstandard-Windows_NT;
netstandard-Unix;
- net46-Windows_NT;
netfx-Windows_NT;
diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
index 4c3ffdaedf16..7e4e44c39952 100644
--- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
+++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
@@ -9,18 +9,12 @@
true
-
-
-
-
-
-
- net46
-
-
-
-
\ No newline at end of file
diff --git a/src/System.Net.Http/ref/System.Net.Http.csproj b/src/System.Net.Http/ref/System.Net.Http.csproj
index 06b524d4485e..bd399cd31b01 100644
--- a/src/System.Net.Http/ref/System.Net.Http.csproj
+++ b/src/System.Net.Http/ref/System.Net.Http.csproj
@@ -4,6 +4,8 @@
{132BF813-FC40-4D39-8B6F-E55D7633F0ED}
+
+
@@ -13,7 +15,7 @@
-
+
@@ -21,7 +23,7 @@
-
+
diff --git a/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj
index e5d870361a5e..7471a78d95a8 100644
--- a/src/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/System.Net.Http/src/System.Net.Http.csproj
@@ -373,7 +373,7 @@
-
+
diff --git a/src/System.Net.Http/src/System/Net/Http/HttpContent.cs b/src/System.Net.Http/src/System/Net/Http/HttpContent.cs
index 5737a491f91e..35cefed00dad 100644
--- a/src/System.Net.Http/src/System/Net/Http/HttpContent.cs
+++ b/src/System.Net.Http/src/System/Net/Http/HttpContent.cs
@@ -2,7 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+#if !NET46
using System.Buffers;
+#endif
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.IO;
diff --git a/src/System.Net.HttpListener/System.Net.HttpListener.sln b/src/System.Net.HttpListener/System.Net.HttpListener.sln
index aac038f034a1..a8ffdd712030 100644
--- a/src/System.Net.HttpListener/System.Net.HttpListener.sln
+++ b/src/System.Net.HttpListener/System.Net.HttpListener.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener.Tests", "tests\System.Net.HttpListener.Tests.csproj", "{851A40FE-7F07-415D-8592-5FE2096E84D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener.Tests", "tests/System.Net.HttpListener.Tests.csproj", "{851A40FE-7F07-415D-8592-5FE2096E84D3}"
ProjectSection(ProjectDependencies) = postProject
{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB} = {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener", "src\System.Net.HttpListener.csproj", "{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener", "src/System.Net.HttpListener.csproj", "{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}"
ProjectSection(ProjectDependencies) = postProject
{41899248-F846-4F88-91A1-01B037F93BF3} = {41899248-F846-4F88-91A1-01B037F93BF3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener", "ref\System.Net.HttpListener.csproj", "{41899248-F846-4F88-91A1-01B037F93BF3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.HttpListener", "ref/System.Net.HttpListener.csproj", "{41899248-F846-4F88-91A1-01B037F93BF3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.Mail/System.Net.Mail.sln b/src/System.Net.Mail/System.Net.Mail.sln
index 188c6f300c32..940554327195 100644
--- a/src/System.Net.Mail/System.Net.Mail.sln
+++ b/src/System.Net.Mail/System.Net.Mail.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail.Functional.Tests", "tests\Functional\System.Net.Mail.Functional.Tests.csproj", "{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail.Unit.Tests", "tests/Unit/System.Net.Mail.Unit.Tests.csproj", "{2525E37E-0EC1-4374-92FD-D2752BEED978}"
ProjectSection(ProjectDependencies) = postProject
{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {2BA70C31-18B0-461B-B6C9-14B11B65BE89}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail.Unit.Tests", "tests\Unit\System.Net.Mail.Unit.Tests.csproj", "{2525E37E-0EC1-4374-92FD-D2752BEED978}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail.Functional.Tests", "tests/Functional/System.Net.Mail.Functional.Tests.csproj", "{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}"
ProjectSection(ProjectDependencies) = postProject
{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {2BA70C31-18B0-461B-B6C9-14B11B65BE89}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail", "src\System.Net.Mail.csproj", "{2BA70C31-18B0-461B-B6C9-14B11B65BE89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail", "src/System.Net.Mail.csproj", "{2BA70C31-18B0-461B-B6C9-14B11B65BE89}"
ProjectSection(ProjectDependencies) = postProject
{301ABDC3-6604-477F-B7CB-1AAD6A8408CF} = {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail", "ref\System.Net.Mail.csproj", "{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Mail", "ref/System.Net.Mail.csproj", "{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {A26D88B7-6EF6-4C8C-828B-7B57732CCE38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{2525E37E-0EC1-4374-92FD-D2752BEED978} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {A26D88B7-6EF6-4C8C-828B-7B57732CCE38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{301ABDC3-6604-477F-B7CB-1AAD6A8408CF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.NameResolution/System.Net.NameResolution.sln b/src/System.Net.NameResolution/System.Net.NameResolution.sln
index 1adbcff3b604..156c3ccb5880 100644
--- a/src/System.Net.NameResolution/System.Net.NameResolution.sln
+++ b/src/System.Net.NameResolution/System.Net.NameResolution.sln
@@ -2,27 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Functional.Tests", "tests\FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj", "{4FE5ECEE-ACC5-4558-A946-573426599B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Unit.Tests", "tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj", "{239347DB-D566-48C9-9551-28AB3AD12EC3}"
ProjectSection(ProjectDependencies) = postProject
{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Pal.Tests.csproj", "{F6D1C093-081D-46DE-B5A8-516533375FDD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Pal.Tests", "tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj", "{F6D1C093-081D-46DE-B5A8-516533375FDD}"
ProjectSection(ProjectDependencies) = postProject
{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Unit.Tests", "tests\UnitTests\System.Net.NameResolution.Unit.Tests.csproj", "{239347DB-D566-48C9-9551-28AB3AD12EC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Functional.Tests", "tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj", "{4FE5ECEE-ACC5-4558-A946-573426599B73}"
ProjectSection(ProjectDependencies) = postProject
{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution", "src\System.Net.NameResolution.csproj", "{1714448C-211E-48C1-8B7E-4EE667D336A1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution", "src/System.Net.NameResolution.csproj", "{1714448C-211E-48C1-8B7E-4EE667D336A1}"
ProjectSection(ProjectDependencies) = postProject
{324DF6B2-4234-47FF-A2C7-A739F19E8F17} = {324DF6B2-4234-47FF-A2C7-A739F19E8F17}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution", "ref\System.Net.NameResolution.csproj", "{324DF6B2-4234-47FF-A2C7-A739F19E8F17}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution", "ref/System.Net.NameResolution.csproj", "{324DF6B2-4234-47FF-A2C7-A739F19E8F17}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -36,18 +36,18 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
- {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
- {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
- {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
- {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
- {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
- {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
- {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+ {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+ {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
+ {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
+ {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
+ {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -61,9 +61,9 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {4FE5ECEE-ACC5-4558-A946-573426599B73} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {F6D1C093-081D-46DE-B5A8-516533375FDD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{239347DB-D566-48C9-9551-28AB3AD12EC3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {F6D1C093-081D-46DE-B5A8-516533375FDD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {4FE5ECEE-ACC5-4558-A946-573426599B73} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{1714448C-211E-48C1-8B7E-4EE667D336A1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{324DF6B2-4234-47FF-A2C7-A739F19E8F17} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
index f1a93c29d7d1..3037e1ca8823 100644
--- a/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
+++ b/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation.Functional.Tests", "tests\FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj", "{DCBB8805-4658-44BF-B5E8-B6714EC8936B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation.WinRT.Unit.Tests", "tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj", "{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}"
ProjectSection(ProjectDependencies) = postProject
{3CA89D6C-F8D1-4813-9775-F8D249686E31} = {3CA89D6C-F8D1-4813-9775-F8D249686E31}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation.WinRT.Unit.Tests", "tests\UnitTests\System.Net.NetworkInformation.WinRT.Unit.Tests.csproj", "{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation.Functional.Tests", "tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj", "{DCBB8805-4658-44BF-B5E8-B6714EC8936B}"
ProjectSection(ProjectDependencies) = postProject
{3CA89D6C-F8D1-4813-9775-F8D249686E31} = {3CA89D6C-F8D1-4813-9775-F8D249686E31}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation", "src\System.Net.NetworkInformation.csproj", "{3CA89D6C-F8D1-4813-9775-F8D249686E31}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation", "src/System.Net.NetworkInformation.csproj", "{3CA89D6C-F8D1-4813-9775-F8D249686E31}"
ProjectSection(ProjectDependencies) = postProject
{B897C3BE-7162-44BB-8B81-7A2464C082A7} = {B897C3BE-7162-44BB-8B81-7A2464C082A7}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation", "ref\System.Net.NetworkInformation.csproj", "{B897C3BE-7162-44BB-8B81-7A2464C082A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NetworkInformation", "ref/System.Net.NetworkInformation.csproj", "{B897C3BE-7162-44BB-8B81-7A2464C082A7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {DCBB8805-4658-44BF-B5E8-B6714EC8936B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {DCBB8805-4658-44BF-B5E8-B6714EC8936B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{3CA89D6C-F8D1-4813-9775-F8D249686E31} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{B897C3BE-7162-44BB-8B81-7A2464C082A7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.Ping/System.Net.Ping.sln b/src/System.Net.Ping/System.Net.Ping.sln
index d42d6361bfd5..02f85bb0a79e 100644
--- a/src/System.Net.Ping/System.Net.Ping.sln
+++ b/src/System.Net.Ping/System.Net.Ping.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping.Functional.Tests", "tests\FunctionalTests\System.Net.Ping.Functional.Tests.csproj", "{43CE20B7-389B-41BB-8390-447521DF3BD4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping.Functional.Tests", "tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj", "{43CE20B7-389B-41BB-8390-447521DF3BD4}"
ProjectSection(ProjectDependencies) = postProject
{85FD05E8-A4B1-4B89-ABED-33AFD200CABD} = {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping", "src\System.Net.Ping.csproj", "{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping", "src/System.Net.Ping.csproj", "{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}"
ProjectSection(ProjectDependencies) = postProject
{933C2AC2-1188-45D1-B0C1-08D6382DC0BE} = {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping", "ref\System.Net.Ping.csproj", "{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Ping", "ref/System.Net.Ping.csproj", "{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.Primitives/System.Net.Primitives.sln b/src/System.Net.Primitives/System.Net.Primitives.sln
index 380882b714ab..759bd615349b 100644
--- a/src/System.Net.Primitives/System.Net.Primitives.sln
+++ b/src/System.Net.Primitives/System.Net.Primitives.sln
@@ -2,32 +2,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Functional.Tests", "tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj", "{E671BC9F-A64C-4504-8B00-7A3215B99AF9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.UnitTests.Tests", "tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj", "{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Pal.Tests", "tests\PalTests\System.Net.Primitives.Pal.Tests.csproj", "{7860A11A-1841-4416-8A30-28EEEB42C6BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Performance.Tests", "tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj", "{86256B36-4C78-4A71-A80A-CCA35C4AE758}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Performance.Tests", "tests\PerformanceTests\System.Net.Primitives.Performance.Tests.csproj", "{86256B36-4C78-4A71-A80A-CCA35C4AE758}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Pal.Tests", "tests/PalTests/System.Net.Primitives.Pal.Tests.csproj", "{7860A11A-1841-4416-8A30-28EEEB42C6BB}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.UnitTests.Tests", "tests\UnitTests\System.Net.Primitives.UnitTests.Tests.csproj", "{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives.Functional.Tests", "tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj", "{E671BC9F-A64C-4504-8B00-7A3215B99AF9}"
ProjectSection(ProjectDependencies) = postProject
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "src\System.Net.Primitives.csproj", "{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "src/System.Net.Primitives.csproj", "{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}"
ProjectSection(ProjectDependencies) = postProject
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "ref\System.Net.Primitives.csproj", "{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Primitives", "ref/System.Net.Primitives.csproj", "{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -41,22 +41,22 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
- {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
- {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
- {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
- {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
- {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
- {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
- {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
- {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
- {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
- {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
- {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+ {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
+ {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
+ {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
+ {86256B36-4C78-4A71-A80A-CCA35C4AE758}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
+ {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
+ {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
+ {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
+ {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
+ {E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -70,10 +70,10 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {E671BC9F-A64C-4504-8B00-7A3215B99AF9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {7860A11A-1841-4416-8A30-28EEEB42C6BB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {86256B36-4C78-4A71-A80A-CCA35C4AE758} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {86256B36-4C78-4A71-A80A-CCA35C4AE758} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {7860A11A-1841-4416-8A30-28EEEB42C6BB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {E671BC9F-A64C-4504-8B00-7A3215B99AF9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.Requests/System.Net.Requests.sln b/src/System.Net.Requests/System.Net.Requests.sln
index ca9fd574b416..3340b8fb3d15 100644
--- a/src/System.Net.Requests/System.Net.Requests.sln
+++ b/src/System.Net.Requests/System.Net.Requests.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests.Tests", "tests\System.Net.Requests.Tests.csproj", "{E520B5FD-C6FF-46CF-8079-6C8098013EA3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests.Tests", "tests/System.Net.Requests.Tests.csproj", "{E520B5FD-C6FF-46CF-8079-6C8098013EA3}"
ProjectSection(ProjectDependencies) = postProject
{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F} = {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests", "src\System.Net.Requests.csproj", "{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests", "src/System.Net.Requests.csproj", "{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}"
ProjectSection(ProjectDependencies) = postProject
{F86C715C-E37B-4853-869E-D696AB3DB057} = {F86C715C-E37B-4853-869E-D696AB3DB057}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests", "ref\System.Net.Requests.csproj", "{F86C715C-E37B-4853-869E-D696AB3DB057}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Requests", "ref/System.Net.Requests.csproj", "{F86C715C-E37B-4853-869E-D696AB3DB057}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.Security/System.Net.Security.sln b/src/System.Net.Security/System.Net.Security.sln
index 7661a942233e..e7044241727a 100644
--- a/src/System.Net.Security/System.Net.Security.sln
+++ b/src/System.Net.Security/System.Net.Security.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security.Tests", "tests\FunctionalTests\System.Net.Security.Tests.csproj", "{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security.Unit.Tests", "tests/UnitTests/System.Net.Security.Unit.Tests.csproj", "{0D174EA9-9E61-4519-8D31-7BD2331A1982}"
ProjectSection(ProjectDependencies) = postProject
{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {89F37791-6254-4D60-AB96-ACD3CCA0E771}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security.Unit.Tests", "tests\UnitTests\System.Net.Security.Unit.Tests.csproj", "{0D174EA9-9E61-4519-8D31-7BD2331A1982}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security.Tests", "tests/FunctionalTests/System.Net.Security.Tests.csproj", "{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}"
ProjectSection(ProjectDependencies) = postProject
{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {89F37791-6254-4D60-AB96-ACD3CCA0E771}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security", "src\System.Net.Security.csproj", "{89F37791-6254-4D60-AB96-ACD3CCA0E771}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security", "src/System.Net.Security.csproj", "{89F37791-6254-4D60-AB96-ACD3CCA0E771}"
ProjectSection(ProjectDependencies) = postProject
{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8} = {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security", "ref\System.Net.Security.csproj", "{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Security", "ref/System.Net.Security.csproj", "{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
- {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
- {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
- {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
+ {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{0D174EA9-9E61-4519-8D31-7BD2331A1982} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {A55A2B9A-830F-4330-A0E7-02A9FB30ABD2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/System.Net.ServicePoint/System.Net.ServicePoint.sln
index 8048f7ef2b43..dd7215d3a092 100644
--- a/src/System.Net.ServicePoint/System.Net.ServicePoint.sln
+++ b/src/System.Net.ServicePoint/System.Net.ServicePoint.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint.Tests", "tests\System.Net.ServicePoint.Tests.csproj", "{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint.Tests", "tests/System.Net.ServicePoint.Tests.csproj", "{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}"
ProjectSection(ProjectDependencies) = postProject
{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3} = {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint", "src\System.Net.ServicePoint.csproj", "{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint", "src/System.Net.ServicePoint.csproj", "{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}"
ProjectSection(ProjectDependencies) = postProject
{273A0AE8-6298-4382-9572-E39ACEB458A0} = {273A0AE8-6298-4382-9572-E39ACEB458A0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint", "ref\System.Net.ServicePoint.csproj", "{273A0AE8-6298-4382-9572-E39ACEB458A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.ServicePoint", "ref/System.Net.ServicePoint.csproj", "{273A0AE8-6298-4382-9572-E39ACEB458A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.Sockets/System.Net.Sockets.sln b/src/System.Net.Sockets/System.Net.Sockets.sln
index 8a3f64f5782b..0df72c10299e 100644
--- a/src/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/System.Net.Sockets/System.Net.Sockets.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets.Tests", "tests\FunctionalTests\System.Net.Sockets.Tests.csproj", "{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets.Async.Performance.Tests", "tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj", "{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}"
ProjectSection(ProjectDependencies) = postProject
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets.Async.Performance.Tests", "tests\PerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj", "{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets.Tests", "tests/FunctionalTests/System.Net.Sockets.Tests.csproj", "{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}"
ProjectSection(ProjectDependencies) = postProject
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets", "src\System.Net.Sockets.csproj", "{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets", "src/System.Net.Sockets.csproj", "{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}"
ProjectSection(ProjectDependencies) = postProject
{834E3534-6A11-4A8D-923F-35C1E71CCEC3} = {834E3534-6A11-4A8D-923F-35C1E71CCEC3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets", "ref\System.Net.Sockets.csproj", "{834E3534-6A11-4A8D-923F-35C1E71CCEC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Sockets", "ref/System.Net.Sockets.csproj", "{834E3534-6A11-4A8D-923F-35C1E71CCEC3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -31,14 +31,14 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
+ {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -52,8 +52,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{834E3534-6A11-4A8D-923F-35C1E71CCEC3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Net.WebClient/System.Net.WebClient.sln b/src/System.Net.WebClient/System.Net.WebClient.sln
index 3cd3b1b36bc7..d36c35f83879 100644
--- a/src/System.Net.WebClient/System.Net.WebClient.sln
+++ b/src/System.Net.WebClient/System.Net.WebClient.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient.Tests", "tests\System.Net.WebClient.Tests.csproj", "{D2348221-084D-4076-91BF-C24D28E7D386}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient.Tests", "tests/System.Net.WebClient.Tests.csproj", "{D2348221-084D-4076-91BF-C24D28E7D386}"
ProjectSection(ProjectDependencies) = postProject
{EA25218A-0470-44CC-BDF0-3E74D5848BD8} = {EA25218A-0470-44CC-BDF0-3E74D5848BD8}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient", "src\System.Net.WebClient.csproj", "{EA25218A-0470-44CC-BDF0-3E74D5848BD8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient", "src/System.Net.WebClient.csproj", "{EA25218A-0470-44CC-BDF0-3E74D5848BD8}"
ProjectSection(ProjectDependencies) = postProject
{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45} = {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient", "ref\System.Net.WebClient.csproj", "{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebClient", "ref/System.Net.WebClient.csproj", "{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
index 46247594ba1d..3fba927c26f2 100644
--- a/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
+++ b/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection.Tests", "tests\System.Net.WebHeaderCollection.Tests.csproj", "{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection.Tests", "tests/System.Net.WebHeaderCollection.Tests.csproj", "{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}"
ProjectSection(ProjectDependencies) = postProject
{C7DB0DF2-9CF2-42FB-89A7-450550B52C48} = {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection", "src\System.Net.WebHeaderCollection.csproj", "{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection", "src/System.Net.WebHeaderCollection.csproj", "{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}"
ProjectSection(ProjectDependencies) = postProject
{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2} = {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection", "ref\System.Net.WebHeaderCollection.csproj", "{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebHeaderCollection", "ref/System.Net.WebHeaderCollection.csproj", "{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.WebProxy/System.Net.WebProxy.sln b/src/System.Net.WebProxy/System.Net.WebProxy.sln
index 280252e80687..8c7ab4c0b781 100644
--- a/src/System.Net.WebProxy/System.Net.WebProxy.sln
+++ b/src/System.Net.WebProxy/System.Net.WebProxy.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy.Tests", "tests\System.Net.WebProxy.Tests.csproj", "{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy.Tests", "tests/System.Net.WebProxy.Tests.csproj", "{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}"
ProjectSection(ProjectDependencies) = postProject
{6C18AD20-E20F-4652-83E3-D24E4670530D} = {6C18AD20-E20F-4652-83E3-D24E4670530D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy", "src\System.Net.WebProxy.csproj", "{6C18AD20-E20F-4652-83E3-D24E4670530D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy", "src/System.Net.WebProxy.csproj", "{6C18AD20-E20F-4652-83E3-D24E4670530D}"
ProjectSection(ProjectDependencies) = postProject
{B7B008FB-2C9F-4111-887C-E3FEC284FE3C} = {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy", "ref\System.Net.WebProxy.csproj", "{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebProxy", "ref/System.Net.WebProxy.csproj", "{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
index 6a6623384267..f897186b11a5 100644
--- a/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
+++ b/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client.Tests", "tests\System.Net.WebSockets.Client.Tests.csproj", "{7C395A91-D955-444C-98BF-D3F809A56CE1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client.Tests", "tests/System.Net.WebSockets.Client.Tests.csproj", "{7C395A91-D955-444C-98BF-D3F809A56CE1}"
ProjectSection(ProjectDependencies) = postProject
{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B} = {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client", "src\System.Net.WebSockets.Client.csproj", "{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client", "src/System.Net.WebSockets.Client.csproj", "{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}"
ProjectSection(ProjectDependencies) = postProject
{F282B57E-2E1E-422B-8AC2-88145E37B809} = {F282B57E-2E1E-422B-8AC2-88145E37B809}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client", "ref\System.Net.WebSockets.Client.csproj", "{F282B57E-2E1E-422B-8AC2-88145E37B809}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Client", "ref/System.Net.WebSockets.Client.csproj", "{F282B57E-2E1E-422B-8AC2-88145E37B809}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Net.WebSockets/System.Net.WebSockets.sln b/src/System.Net.WebSockets/System.Net.WebSockets.sln
index cc0deebb0175..5286cab3e767 100644
--- a/src/System.Net.WebSockets/System.Net.WebSockets.sln
+++ b/src/System.Net.WebSockets/System.Net.WebSockets.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Tests", "tests\System.Net.WebSockets.Tests.csproj", "{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets.Tests", "tests/System.Net.WebSockets.Tests.csproj", "{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}"
ProjectSection(ProjectDependencies) = postProject
{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1} = {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets", "src\System.Net.WebSockets.csproj", "{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets", "src/System.Net.WebSockets.csproj", "{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}"
ProjectSection(ProjectDependencies) = postProject
{A2F08695-A550-4AA2-806D-E5E7D86D8F25} = {A2F08695-A550-4AA2-806D-E5E7D86D8F25}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets", "ref\System.Net.WebSockets.csproj", "{A2F08695-A550-4AA2-806D-E5E7D86D8F25}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.WebSockets", "ref/System.Net.WebSockets.csproj", "{A2F08695-A550-4AA2-806D-E5E7D86D8F25}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Numerics.Vectors.WindowsRuntime/System.Numerics.Vectors.WindowsRuntime.sln b/src/System.Numerics.Vectors.WindowsRuntime/System.Numerics.Vectors.WindowsRuntime.sln
index 0b96cc9dd5b4..400dd81ddeff 100644
--- a/src/System.Numerics.Vectors.WindowsRuntime/System.Numerics.Vectors.WindowsRuntime.sln
+++ b/src/System.Numerics.Vectors.WindowsRuntime/System.Numerics.Vectors.WindowsRuntime.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.WindowsRuntime", "src\System.Numerics.Vectors.WindowsRuntime.csproj", "{25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.WindowsRuntime", "src/System.Numerics.Vectors.WindowsRuntime.csproj", "{25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
@@ -12,10 +12,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Debug|Any CPU.ActiveCfg = netcore50-Windows_NT-Debug|Any CPU
- {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Debug|Any CPU.Build.0 = netcore50-Windows_NT-Debug|Any CPU
- {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Release|Any CPU.ActiveCfg = netcore50-Windows_NT-Release|Any CPU
- {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Release|Any CPU.Build.0 = netcore50-Windows_NT-Release|Any CPU
+ {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Debug|Any CPU.ActiveCfg = uap-Windows_NT-Debug|Any CPU
+ {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Debug|Any CPU.Build.0 = uap-Windows_NT-Debug|Any CPU
+ {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Release|Any CPU.ActiveCfg = uap-Windows_NT-Release|Any CPU
+ {25FD0CB0-D3A8-4258-9408-30E69EEB0FF3}.Release|Any CPU.Build.0 = uap-Windows_NT-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/System.Numerics.Vectors.WindowsRuntime/src/Configurations.props b/src/System.Numerics.Vectors.WindowsRuntime/src/Configurations.props
index 7032ace60c93..0f1f50d3ec47 100644
--- a/src/System.Numerics.Vectors.WindowsRuntime/src/Configurations.props
+++ b/src/System.Numerics.Vectors.WindowsRuntime/src/Configurations.props
@@ -2,7 +2,6 @@
- netcore50-Windows_NT;
uapaot-Windows_NT;
uap-Windows_NT;
diff --git a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj
index 53e0f30036f9..024f6e688699 100644
--- a/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj
+++ b/src/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.csproj
@@ -7,8 +7,6 @@
true
-
-
diff --git a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln
index d928320b9bf6..3c07b9b4c4f0 100644
--- a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln
+++ b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.Tests", "tests\System.Numerics.Vectors.Tests.csproj", "{99E1E564-0EF4-4E33-BECE-8ABE64771349}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.Tests", "tests/System.Numerics.Vectors.Tests.csproj", "{99E1E564-0EF4-4E33-BECE-8ABE64771349}"
ProjectSection(ProjectDependencies) = postProject
{53134B0C-0D57-481B-B84E-D1991E8D54FF} = {53134B0C-0D57-481B-B84E-D1991E8D54FF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.Performance.Tests", "tests\Performance\System.Numerics.Vectors.Performance.Tests.csproj", "{D9906F1A-A41A-43CD-81D2-BA94CF0001C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.Performance.Tests", "tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj", "{D9906F1A-A41A-43CD-81D2-BA94CF0001C9}"
ProjectSection(ProjectDependencies) = postProject
{53134B0C-0D57-481B-B84E-D1991E8D54FF} = {53134B0C-0D57-481B-B84E-D1991E8D54FF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors", "src\System.Numerics.Vectors.csproj", "{53134B0C-0D57-481B-B84E-D1991E8D54FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors", "src/System.Numerics.Vectors.csproj", "{53134B0C-0D57-481B-B84E-D1991E8D54FF}"
ProjectSection(ProjectDependencies) = postProject
{650277B5-9423-4ACE-BB54-2659995B21C7} = {650277B5-9423-4ACE-BB54-2659995B21C7}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors", "ref\System.Numerics.Vectors.csproj", "{650277B5-9423-4ACE-BB54-2659995B21C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors", "ref/System.Numerics.Vectors.csproj", "{650277B5-9423-4ACE-BB54-2659995B21C7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ObjectModel/System.ObjectModel.sln b/src/System.ObjectModel/System.ObjectModel.sln
index 3fc45d59fb82..1375744bcfec 100644
--- a/src/System.ObjectModel/System.ObjectModel.sln
+++ b/src/System.ObjectModel/System.ObjectModel.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel.Tests", "tests\System.ObjectModel.Tests.csproj", "{43841228-2A2B-4215-B97F-33006995E486}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel.Tests", "tests/System.ObjectModel.Tests.csproj", "{43841228-2A2B-4215-B97F-33006995E486}"
ProjectSection(ProjectDependencies) = postProject
{F24D3391-2928-4E83-AADE-A4461E5CAE50} = {F24D3391-2928-4E83-AADE-A4461E5CAE50}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel", "src\System.ObjectModel.csproj", "{F24D3391-2928-4E83-AADE-A4461E5CAE50}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel", "src/System.ObjectModel.csproj", "{F24D3391-2928-4E83-AADE-A4461E5CAE50}"
ProjectSection(ProjectDependencies) = postProject
{72CD7613-337A-41C1-BE90-391973C25201} = {72CD7613-337A-41C1-BE90-391973C25201}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel", "ref\System.ObjectModel.csproj", "{72CD7613-337A-41C1-BE90-391973C25201}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel", "ref/System.ObjectModel.csproj", "{72CD7613-337A-41C1-BE90-391973C25201}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln b/src/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
index a6f02b06e795..f44ba1acbd42 100644
--- a/src/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
+++ b/src/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.DataContractSerialization", "src\System.Private.DataContractSerialization.csproj", "{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.DataContractSerialization", "src/System.Private.DataContractSerialization.csproj", "{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Private.Uri/System.Private.Uri.sln b/src/System.Private.Uri/System.Private.Uri.sln
index bcdf69345a4b..c2623dece76f 100644
--- a/src/System.Private.Uri/System.Private.Uri.sln
+++ b/src/System.Private.Uri/System.Private.Uri.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.ExtendedFunctional.Tests", "tests\ExtendedFunctionalTests\System.Private.Uri.ExtendedFunctional.Tests.csproj", "{0febe054-68ac-446f-b999-9068736d3cec}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.Unit.Tests", "tests/UnitTests/System.Private.Uri.Unit.Tests.csproj", "{96AF3242-A368-4F13-B006-A722CC3B8517}"
ProjectSection(ProjectDependencies) = postProject
{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.Functional.Tests", "tests\FunctionalTests\System.Private.Uri.Functional.Tests.csproj", "{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.Functional.Tests", "tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj", "{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}"
ProjectSection(ProjectDependencies) = postProject
{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.Unit.Tests", "tests\UnitTests\System.Private.Uri.Unit.Tests.csproj", "{96AF3242-A368-4F13-B006-A722CC3B8517}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.ExtendedFunctional.Tests", "tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj", "{0febe054-68ac-446f-b999-9068736d3cec}"
ProjectSection(ProjectDependencies) = postProject
{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri", "src\System.Private.Uri.csproj", "{4AC5343E-6E31-4BA5-A795-0493AE7E9008}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri", "src/System.Private.Uri.csproj", "{4AC5343E-6E31-4BA5-A795-0493AE7E9008}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -29,18 +29,18 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.Build.0 = Release|Any CPU
- {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = Release|Any CPU
{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0febe054-68ac-446f-b999-9068736d3cec}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0febe054-68ac-446f-b999-9068736d3cec}.Release|Any CPU.Build.0 = Release|Any CPU
{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -50,9 +50,9 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {0febe054-68ac-446f-b999-9068736d3cec} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{96AF3242-A368-4F13-B006-A722CC3B8517} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {0febe054-68ac-446f-b999-9068736d3cec} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
EndGlobalSection
EndGlobal
diff --git a/src/System.Private.Uri/src/Configurations.props b/src/System.Private.Uri/src/Configurations.props
index 7b8e714fac54..5f7cb499505e 100644
--- a/src/System.Private.Uri/src/Configurations.props
+++ b/src/System.Private.Uri/src/Configurations.props
@@ -1,13 +1,12 @@
+
uapaot-Windows_NT;
netcoreapp-Unix;
netcoreapp-Windows_NT;
uap-Windows_NT;
- netcoreapp1.2corert-Unix;
- netcoreapp1.2corert-Windows_NT;
\ No newline at end of file
diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj
index 4115c0165b78..f55edc3b97d8 100644
--- a/src/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/System.Private.Uri/src/System.Private.Uri.csproj
@@ -15,10 +15,6 @@
-
-
-
-
diff --git a/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln b/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
index 42b6e0b56f44..471fa8212c55 100644
--- a/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
+++ b/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
@@ -2,72 +2,72 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Axes.Tests", "tests\axes\System.Xml.Linq.Axes.Tests.csproj", "{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument.Tests", "tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj", "{10D52320-17B7-476E-BBD2-A1064DD38CBF}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Events.Tests", "tests\events\System.Xml.Linq.Events.Tests.csproj", "{C560E194-5B14-4112-ABC6-3208491E53E6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.xNodeReader.Tests", "tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj", "{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Misc.Tests", "tests\misc\System.Xml.Linq.Misc.Tests.csproj", "{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.xNodeBuilder.Tests", "tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj", "{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Properties.Tests", "tests\Properties\System.Xml.Linq.Properties.Tests.csproj", "{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Test.ModuleCore", "tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj", "{979510CE-9042-4F8D-9C74-EE03B89194CC}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Schema.Extensions.Tests", "tests\Schema\System.Xml.Schema.Extensions.Tests.csproj", "{AFB408EA-2EF7-42B3-B98F-BA60F6481313}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Common", "tests/XDocument.Common/XDocument.Common.csproj", "{52666206-B6C9-49FA-A1D7-D0A0C68807B0}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.SDMSample.Tests", "tests\SDMSample\System.Xml.Linq.SDMSample.Tests.csproj", "{F6C73170-9333-4B52-B3FA-A536C5EA6A48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.TreeManipulation.Tests", "tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj", "{10EFE488-FAB4-43DA-847D-FF057BFF52AC}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Streaming.Tests", "tests\Streaming\System.Xml.Linq.Streaming.Tests.csproj", "{CB11B315-2567-4574-977D-89E3135243C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Streaming.Tests", "tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj", "{CB11B315-2567-4574-977D-89E3135243C4}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.TreeManipulation.Tests", "tests\TreeManipulation\System.Xml.Linq.TreeManipulation.Tests.csproj", "{10EFE488-FAB4-43DA-847D-FF057BFF52AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.SDMSample.Tests", "tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj", "{F6C73170-9333-4B52-B3FA-A536C5EA6A48}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Common", "tests\XDocument.Common\XDocument.Common.csproj", "{52666206-B6C9-49FA-A1D7-D0A0C68807B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Schema.Extensions.Tests", "tests/Schema/System.Xml.Schema.Extensions.Tests.csproj", "{AFB408EA-2EF7-42B3-B98F-BA60F6481313}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Test.ModuleCore", "tests\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj", "{979510CE-9042-4F8D-9C74-EE03B89194CC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Properties.Tests", "tests/Properties/System.Xml.Linq.Properties.Tests.csproj", "{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.xNodeBuilder.Tests", "tests\xNodeBuilder\System.Xml.Linq.xNodeBuilder.Tests.csproj", "{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Misc.Tests", "tests/misc/System.Xml.Linq.Misc.Tests.csproj", "{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.xNodeReader.Tests", "tests\xNodeReader\System.Xml.Linq.xNodeReader.Tests.csproj", "{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Events.Tests", "tests/events/System.Xml.Linq.Events.Tests.csproj", "{C560E194-5B14-4112-ABC6-3208491E53E6}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument.Tests", "tests\XPath\XDocument\System.Xml.XPath.XDocument.Tests.csproj", "{10D52320-17B7-476E-BBD2-A1064DD38CBF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Linq.Axes.Tests", "tests/axes/System.Xml.Linq.Axes.Tests.csproj", "{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}"
ProjectSection(ProjectDependencies) = postProject
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Xml.Linq", "src\System.Private.Xml.Linq.csproj", "{BAC347A3-9841-44FC-B1E3-2344D1152C23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Xml.Linq", "src/System.Private.Xml.Linq.csproj", "{BAC347A3-9841-44FC-B1E3-2344D1152C23}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -79,58 +79,58 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.Build.0 = Release|Any CPU
- {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = Release|Any CPU
- {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.Build.0 = Release|Any CPU
- {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = Release|Any CPU
- {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = Release|Any CPU
- {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = Release|Any CPU
- {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = Release|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
+ {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
+ {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
+ {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.Build.0 = Release|Any CPU
{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -140,19 +140,19 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {C560E194-5B14-4112-ABC6-3208491E53E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {D24E2563-7A46-4368-94D4-B3A39E9EF1B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {AFB408EA-2EF7-42B3-B98F-BA60F6481313} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {F6C73170-9333-4B52-B3FA-A536C5EA6A48} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {CB11B315-2567-4574-977D-89E3135243C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {10EFE488-FAB4-43DA-847D-FF057BFF52AC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {52666206-B6C9-49FA-A1D7-D0A0C68807B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {979510CE-9042-4F8D-9C74-EE03B89194CC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{10D52320-17B7-476E-BBD2-A1064DD38CBF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {979510CE-9042-4F8D-9C74-EE03B89194CC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {52666206-B6C9-49FA-A1D7-D0A0C68807B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {10EFE488-FAB4-43DA-847D-FF057BFF52AC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {CB11B315-2567-4574-977D-89E3135243C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {F6C73170-9333-4B52-B3FA-A536C5EA6A48} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {AFB408EA-2EF7-42B3-B98F-BA60F6481313} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {35FA1FA9-A504-4B9E-93F0-E5D03C21BECA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {C560E194-5B14-4112-ABC6-3208491E53E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
EndGlobalSection
EndGlobal
diff --git a/src/System.Private.Xml/System.Private.Xml.sln b/src/System.Private.Xml/System.Private.Xml.sln
index ba7066930144..4d0ed331cf67 100644
--- a/src/System.Private.Xml/System.Private.Xml.sln
+++ b/src/System.Private.Xml/System.Private.Xml.sln
@@ -2,142 +2,142 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Misc.Tests", "tests\Misc\System.Xml.Misc.Tests.csproj", "{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Xsl.XslTransformApi.Tests", "tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj", "{ACF79A18-2655-452C-B4AC-10125F0AD7A8}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.CharCheckingReader.Tests", "tests\Readers\CharCheckingReader\System.Xml.RW.CharCheckingReader.Tests.csproj", "{6DC15D23-8213-4700-9815-AD8DEED1CE5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XsltCompiler.Tests", "tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj", "{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.CustomReader.Tests", "tests\Readers\CustomReader\System.Xml.RW.CustomReader.Tests.csproj", "{B51913C2-478E-46AA-A523-521BD4593651}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Xsl.XslCompiledTransformApi.Tests", "tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj", "{B01E2AE1-1B52-4518-B32E-016070356A7F}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.FactoryReader.Tests", "tests\Readers\FactoryReader\System.Xml.RW.FactoryReader.Tests.csproj", "{04C5492C-FA54-4F93-8698-44B8BB7C72E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.Tests", "tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj", "{D0DF902A-2486-4A38-B7A7-232B9B6590E1}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.NameTable.Tests", "tests\Readers\NameTable\System.Xml.RW.NameTable.Tests.csproj", "{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument.Tests", "tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj", "{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.ReaderSettings.Tests", "tests\Readers\ReaderSettings\System.Xml.RW.ReaderSettings.Tests.csproj", "{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlWriter.Tests", "tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj", "{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.SubtreeReader.Tests", "tests\Readers\SubtreeReader\System.Xml.RW.SubtreeReader.Tests.csproj", "{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer.Tests", "tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.WrappedReader.Tests", "tests\Readers\WrappedReader\System.Xml.RW.WrappedReader.Tests.csproj", "{1C8F67D6-1953-49D3-B716-F298883A79C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer.ReflectionOnly.Tests", "tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.RwFactory.Tests", "tests\Writers\RwFactory\System.Xml.RW.RwFactory.Tests.csproj", "{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests", "tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj", "{B0F53AAA-4ABC-44B2-9331-D3802340DD20}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlWriterApi.Tests", "tests\Writers\XmlWriterApi\System.Xml.RW.XmlWriterApi.Tests.csproj", "{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSchemaSet.Tests", "tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj", "{9EDAADA8-B658-430F-97EE-CCA494883D86}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlConvert.Tests", "tests\XmlConvert\System.Xml.RW.XmlConvert.Tests.csproj", "{3F18D20D-0267-4381-857B-EEDB7B3FC549}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReaderLib", "tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj", "{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument.Tests", "tests\XmlDocument\System.Xml.XmlDocument.Tests.csproj", "{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlSystemPathResolver.Tests", "tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj", "{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument.Performance.Tests", "tests\XmlDocument\Performance\System.Xml.XmlDocument.Performance.Tests.csproj", "{8A7370E5-BF89-4BCF-ACCD-BA298869055B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReader.Tests", "tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj", "{507DB29F-74F5-4B34-A240-ABE7BD168DF6}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReader.ReadContentAs.Tests", "tests\XmlReader\ReadContentAs\System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj", "{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReader.ReadContentAs.Tests", "tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj", "{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReader.Tests", "tests\XmlReader\Tests\System.Xml.RW.XmlReader.Tests.csproj", "{507DB29F-74F5-4B34-A240-ABE7BD168DF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument.Tests", "tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj", "{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlSystemPathResolver.Tests", "tests\XmlReader\XmlResolver\System.Xml.RW.XmlSystemPathResolver.Tests.csproj", "{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument.Performance.Tests", "tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj", "{8A7370E5-BF89-4BCF-ACCD-BA298869055B}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlReaderLib", "tests\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj", "{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlConvert.Tests", "tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj", "{3F18D20D-0267-4381-857B-EEDB7B3FC549}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSchemaSet.Tests", "tests\XmlSchema\XmlSchemaSet\System.Xml.XmlSchemaSet.Tests.csproj", "{9EDAADA8-B658-430F-97EE-CCA494883D86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlWriterApi.Tests", "tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj", "{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests", "tests\XmlSchema\XmlSchemaValidatorApi\System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj", "{B0F53AAA-4ABC-44B2-9331-D3802340DD20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.RwFactory.Tests", "tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj", "{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer.Tests", "tests\XmlSerializer\System.Xml.XmlSerializer.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.WrappedReader.Tests", "tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj", "{1C8F67D6-1953-49D3-B716-F298883A79C6}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer.ReflectionOnly.Tests", "tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.SubtreeReader.Tests", "tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj", "{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.XmlWriter.Tests", "tests\XmlWriter\System.Xml.RW.XmlWriter.Tests.csproj", "{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.ReaderSettings.Tests", "tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj", "{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument.Tests", "tests\XPath\XmlDocument\System.Xml.XPath.XmlDocument.Tests.csproj", "{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.NameTable.Tests", "tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj", "{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.Tests", "tests\XPath\XPathDocument\System.Xml.XPath.Tests.csproj", "{D0DF902A-2486-4A38-B7A7-232B9B6590E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.FactoryReader.Tests", "tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj", "{04C5492C-FA54-4F93-8698-44B8BB7C72E0}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Xsl.XslCompiledTransformApi.Tests", "tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj", "{B01E2AE1-1B52-4518-B32E-016070356A7F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.CustomReader.Tests", "tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj", "{B51913C2-478E-46AA-A523-521BD4593651}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XsltCompiler.Tests", "tests\Xslt\XsltCompiler\XsltCompiler.Tests.csproj", "{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.CharCheckingReader.Tests", "tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj", "{6DC15D23-8213-4700-9815-AD8DEED1CE5F}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Xsl.XslTransformApi.Tests", "tests\Xslt\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj", "{ACF79A18-2655-452C-B4AC-10125F0AD7A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Misc.Tests", "tests/Misc/System.Xml.Misc.Tests.csproj", "{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}"
ProjectSection(ProjectDependencies) = postProject
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Xml", "src\System.Private.Xml.csproj", "{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Xml", "src/System.Private.Xml.csproj", "{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -149,82 +149,30 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.Build.0 = Release|Any CPU
- {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.Build.0 = Release|Any CPU
- {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.Build.0 = Release|Any CPU
- {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.Build.0 = Release|Any CPU
- {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.Build.0 = Release|Any CPU
- {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.Build.0 = Release|Any CPU
- {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.Build.0 = Release|Any CPU
- {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.Build.0 = Release|Any CPU
- {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.Build.0 = Release|Any CPU
- {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.Build.0 = Release|Any CPU
- {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = Release|Any CPU
- {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.Build.0 = Release|Any CPU
- {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.Build.0 = Release|Any CPU
- {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.Build.0 = Release|Any CPU
- {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.Build.0 = Release|Any CPU
- {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.Build.0 = Release|Any CPU
- {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.Build.0 = Release|Any CPU
+ {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.Build.0 = Release|Any CPU
{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -233,30 +181,82 @@ Global
{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.Build.0 = Release|Any CPU
- {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = Release|Any CPU
- {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = Release|Any CPU
- {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.Build.0 = Release|Any CPU
- {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.Build.0 = Release|Any CPU
- {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8A7370E5-BF89-4BCF-ACCD-BA298869055B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.Build.0 = Release|Any CPU
+ {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.Build.0 = Release|Any CPU
+ {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.Build.0 = Release|Any CPU
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -266,33 +266,33 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {A30BBA60-647C-4565-A42F-BE60B2CA2E8E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {6DC15D23-8213-4700-9815-AD8DEED1CE5F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {B51913C2-478E-46AA-A523-521BD4593651} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {04C5492C-FA54-4F93-8698-44B8BB7C72E0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {1C8F67D6-1953-49D3-B716-F298883A79C6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {3F18D20D-0267-4381-857B-EEDB7B3FC549} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {8A7370E5-BF89-4BCF-ACCD-BA298869055B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {507DB29F-74F5-4B34-A240-ABE7BD168DF6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {F05DE950-CA99-42A8-B44D-E7DAA5C3C783} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {9EDAADA8-B658-430F-97EE-CCA494883D86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {B0F53AAA-4ABC-44B2-9331-D3802340DD20} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {ACF79A18-2655-452C-B4AC-10125F0AD7A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {B01E2AE1-1B52-4518-B32E-016070356A7F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {D0DF902A-2486-4A38-B7A7-232B9B6590E1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{4050F1D1-1DD2-4B48-A17B-E3F955518C4B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {8CDE71C2-4DA4-4AF6-9897-CD953AE653C2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {D0DF902A-2486-4A38-B7A7-232B9B6590E1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {B01E2AE1-1B52-4518-B32E-016070356A7F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {59B2167E-E2D6-4E7E-AFFE-4060E1F3843C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {ACF79A18-2655-452C-B4AC-10125F0AD7A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {B0F53AAA-4ABC-44B2-9331-D3802340DD20} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {9EDAADA8-B658-430F-97EE-CCA494883D86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {507DB29F-74F5-4B34-A240-ABE7BD168DF6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {DA6A9B7F-F311-49A4-8BBE-42EF3152C37B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {8A7370E5-BF89-4BCF-ACCD-BA298869055B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {3F18D20D-0267-4381-857B-EEDB7B3FC549} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {1C8F67D6-1953-49D3-B716-F298883A79C6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {2CA30CA9-FADA-4AB6-81E3-EAE61EF44463} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {04C5492C-FA54-4F93-8698-44B8BB7C72E0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {B51913C2-478E-46AA-A523-521BD4593651} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {6DC15D23-8213-4700-9815-AD8DEED1CE5F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {A30BBA60-647C-4565-A42F-BE60B2CA2E8E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
EndGlobalSection
EndGlobal
diff --git a/src/System.Reflection.Context/System.Reflection.Context.sln b/src/System.Reflection.Context/System.Reflection.Context.sln
index 57056d8efa88..5873779c8ad1 100644
--- a/src/System.Reflection.Context/System.Reflection.Context.sln
+++ b/src/System.Reflection.Context/System.Reflection.Context.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context.Tests", "tests\System.Reflection.Context.Tests.csproj", "{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context.Tests", "tests/System.Reflection.Context.Tests.csproj", "{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}"
ProjectSection(ProjectDependencies) = postProject
{404DB891-B5AF-41E6-B89D-29E3F4573C4F} = {404DB891-B5AF-41E6-B89D-29E3F4573C4F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context", "src\System.Reflection.Context.csproj", "{404DB891-B5AF-41E6-B89D-29E3F4573C4F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context", "src/System.Reflection.Context.csproj", "{404DB891-B5AF-41E6-B89D-29E3F4573C4F}"
ProjectSection(ProjectDependencies) = postProject
{C3C70597-F192-430D-9BA6-287B1A974BF7} = {C3C70597-F192-430D-9BA6-287B1A974BF7}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context", "ref\System.Reflection.Context.csproj", "{C3C70597-F192-430D-9BA6-287B1A974BF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Context", "ref/System.Reflection.Context.csproj", "{C3C70597-F192-430D-9BA6-287B1A974BF7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Reflection.Context/src/Configurations.props b/src/System.Reflection.Context/src/Configurations.props
index 8e9f5c957d7c..c398e42e8994 100644
--- a/src/System.Reflection.Context/src/Configurations.props
+++ b/src/System.Reflection.Context/src/Configurations.props
@@ -2,7 +2,6 @@
- netstandard1.1;
netstandard;
diff --git a/src/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/System.Reflection.Context/src/System.Reflection.Context.csproj
index 433964040e3f..110dadab3915 100644
--- a/src/System.Reflection.Context/src/System.Reflection.Context.csproj
+++ b/src/System.Reflection.Context/src/System.Reflection.Context.csproj
@@ -16,8 +16,6 @@
-
-
diff --git a/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
index cf0cd0a90b62..b6ba24b5490a 100644
--- a/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
+++ b/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy.Tests", "tests\System.Reflection.DispatchProxy.Tests.csproj", "{089444FE-8FF5-4D8F-A51B-32D026425F6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy.Tests", "tests/System.Reflection.DispatchProxy.Tests.csproj", "{089444FE-8FF5-4D8F-A51B-32D026425F6B}"
ProjectSection(ProjectDependencies) = postProject
{1E689C1B-690C-4799-BDE9-6E7990585894} = {1E689C1B-690C-4799-BDE9-6E7990585894}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy", "src\System.Reflection.DispatchProxy.csproj", "{1E689C1B-690C-4799-BDE9-6E7990585894}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy", "src/System.Reflection.DispatchProxy.csproj", "{1E689C1B-690C-4799-BDE9-6E7990585894}"
ProjectSection(ProjectDependencies) = postProject
{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E} = {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy", "ref\System.Reflection.DispatchProxy.csproj", "{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.DispatchProxy", "ref/System.Reflection.DispatchProxy.csproj", "{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Reflection.DispatchProxy/src/Configurations.props b/src/System.Reflection.DispatchProxy/src/Configurations.props
index 08c4ae16cd93..33b6df3f826c 100644
--- a/src/System.Reflection.DispatchProxy/src/Configurations.props
+++ b/src/System.Reflection.DispatchProxy/src/Configurations.props
@@ -2,7 +2,6 @@
- netcore50aot-Windows_NT;
uapaot-Windows_NT;
netcoreapp;
uap-Windows_NT;
diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
index 0b7baeaed4ce..099f9883f730 100644
--- a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
+++ b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
@@ -9,8 +9,6 @@
None
-
-
diff --git a/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln b/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
index c2ec6ed5d649..599771364955 100644
--- a/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
+++ b/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration.Tests", "tests\System.Reflection.Emit.ILGeneration.Tests.csproj", "{FB037640-0591-4DF4-A331-0BEFE50A200B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration.Tests", "tests/System.Reflection.Emit.ILGeneration.Tests.csproj", "{FB037640-0591-4DF4-A331-0BEFE50A200B}"
ProjectSection(ProjectDependencies) = postProject
{8F05FFD6-6697-41CA-B733-709F5A6D3BF1} = {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration", "src\System.Reflection.Emit.ILGeneration.csproj", "{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration", "src/System.Reflection.Emit.ILGeneration.csproj", "{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}"
ProjectSection(ProjectDependencies) = postProject
{D8763A34-58C6-4229-AD75-6980EF382294} = {D8763A34-58C6-4229-AD75-6980EF382294}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration", "ref\System.Reflection.Emit.ILGeneration.csproj", "{D8763A34-58C6-4229-AD75-6980EF382294}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.ILGeneration", "ref/System.Reflection.Emit.ILGeneration.csproj", "{D8763A34-58C6-4229-AD75-6980EF382294}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Reflection.Emit.ILGeneration/src/Configurations.props b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
index 262829acbcc2..4e9b1a0bfd13 100644
--- a/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
+++ b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
index b9d12fa03ef4..39c813b4f6d6 100644
--- a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
@@ -4,12 +4,14 @@
System.Reflection.Emit.ILGeneration
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}
-
-
+
+
+
+
diff --git a/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln b/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
index 71975a2f99d6..d38fea28b7ab 100644
--- a/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
+++ b/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight.Tests", "tests\System.Reflection.Emit.Lightweight.Tests.csproj", "{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight.Tests", "tests/System.Reflection.Emit.Lightweight.Tests.csproj", "{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}"
ProjectSection(ProjectDependencies) = postProject
{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9} = {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight", "src\System.Reflection.Emit.Lightweight.csproj", "{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight", "src/System.Reflection.Emit.Lightweight.csproj", "{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}"
ProjectSection(ProjectDependencies) = postProject
{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD} = {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight", "ref\System.Reflection.Emit.Lightweight.csproj", "{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Lightweight", "ref/System.Reflection.Emit.Lightweight.csproj", "{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Reflection.Emit.Lightweight/src/Configurations.props b/src/System.Reflection.Emit.Lightweight/src/Configurations.props
index 262829acbcc2..4e9b1a0bfd13 100644
--- a/src/System.Reflection.Emit.Lightweight/src/Configurations.props
+++ b/src/System.Reflection.Emit.Lightweight/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
index be6211cb1a1d..c13e4884f6a6 100644
--- a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
+++ b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
@@ -4,12 +4,14 @@
System.Reflection.Emit.Lightweight
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}
-
-
+
+
+
+
diff --git a/src/System.Reflection.Emit/System.Reflection.Emit.sln b/src/System.Reflection.Emit/System.Reflection.Emit.sln
index 43eca57e2b27..9734d8f0bc53 100644
--- a/src/System.Reflection.Emit/System.Reflection.Emit.sln
+++ b/src/System.Reflection.Emit/System.Reflection.Emit.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Tests", "tests\System.Reflection.Emit.Tests.csproj", "{1104A263-331A-4CA0-B541-759BD20F7B1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit.Tests", "tests/System.Reflection.Emit.Tests.csproj", "{1104A263-331A-4CA0-B541-759BD20F7B1D}"
ProjectSection(ProjectDependencies) = postProject
{19D670F6-6029-43DB-9F43-CB291EB358F4} = {19D670F6-6029-43DB-9F43-CB291EB358F4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit", "src\System.Reflection.Emit.csproj", "{19D670F6-6029-43DB-9F43-CB291EB358F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit", "src/System.Reflection.Emit.csproj", "{19D670F6-6029-43DB-9F43-CB291EB358F4}"
ProjectSection(ProjectDependencies) = postProject
{4FBD1556-7B96-414E-9EA4-85281956D60E} = {4FBD1556-7B96-414E-9EA4-85281956D60E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit", "ref\System.Reflection.Emit.csproj", "{4FBD1556-7B96-414E-9EA4-85281956D60E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Emit", "ref/System.Reflection.Emit.csproj", "{4FBD1556-7B96-414E-9EA4-85281956D60E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Reflection.Emit/src/Configurations.props b/src/System.Reflection.Emit/src/Configurations.props
index 262829acbcc2..4e9b1a0bfd13 100644
--- a/src/System.Reflection.Emit/src/Configurations.props
+++ b/src/System.Reflection.Emit/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj
index b5f99a0eee7a..b248dac4ff55 100644
--- a/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj
+++ b/src/System.Reflection.Emit/src/System.Reflection.Emit.csproj
@@ -4,12 +4,14 @@
System.Reflection.Emit
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
{19D670F6-6029-43DB-9F43-CB291EB358F4}
-
-
+
+
+
+
diff --git a/src/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/System.Reflection.Extensions/System.Reflection.Extensions.sln
index 2725e72becfd..3657f47d4071 100644
--- a/src/System.Reflection.Extensions/System.Reflection.Extensions.sln
+++ b/src/System.Reflection.Extensions/System.Reflection.Extensions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions.Tests", "tests\System.Reflection.Extensions.Tests.csproj", "{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions.Tests", "tests/System.Reflection.Extensions.Tests.csproj", "{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}"
ProjectSection(ProjectDependencies) = postProject
{26699AB1-DBAC-4819-A1C0-185AB37CF127} = {26699AB1-DBAC-4819-A1C0-185AB37CF127}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions", "src\System.Reflection.Extensions.csproj", "{26699AB1-DBAC-4819-A1C0-185AB37CF127}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions", "src/System.Reflection.Extensions.csproj", "{26699AB1-DBAC-4819-A1C0-185AB37CF127}"
ProjectSection(ProjectDependencies) = postProject
{72E89A6C-1F60-4170-AB7B-14AAD82E293D} = {72E89A6C-1F60-4170-AB7B-14AAD82E293D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions", "ref\System.Reflection.Extensions.csproj", "{72E89A6C-1F60-4170-AB7B-14AAD82E293D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Extensions", "ref/System.Reflection.Extensions.csproj", "{72E89A6C-1F60-4170-AB7B-14AAD82E293D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln
index bfb39ea643ac..a4ee3675607c 100644
--- a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata.Tests", "tests\System.Reflection.Metadata.Tests.csproj", "{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata.Tests", "tests/System.Reflection.Metadata.Tests.csproj", "{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}"
ProjectSection(ProjectDependencies) = postProject
{F3E433C8-352F-4944-BF7F-765CE435370D} = {F3E433C8-352F-4944-BF7F-765CE435370D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata", "src\System.Reflection.Metadata.csproj", "{F3E433C8-352F-4944-BF7F-765CE435370D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata", "src/System.Reflection.Metadata.csproj", "{F3E433C8-352F-4944-BF7F-765CE435370D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/System.Reflection.Primitives/System.Reflection.Primitives.sln
index 5e7bea47e94d..45d63ff16218 100644
--- a/src/System.Reflection.Primitives/System.Reflection.Primitives.sln
+++ b/src/System.Reflection.Primitives/System.Reflection.Primitives.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Primitives", "src\System.Reflection.Primitives.csproj", "{CCE47F37-2C51-44EB-8F54-0474D7831515}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Primitives", "src/System.Reflection.Primitives.csproj", "{CCE47F37-2C51-44EB-8F54-0474D7831515}"
ProjectSection(ProjectDependencies) = postProject
{F512184F-76E5-4AE5-8AB5-395AF9D18712} = {F512184F-76E5-4AE5-8AB5-395AF9D18712}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Primitives", "ref\System.Reflection.Primitives.csproj", "{F512184F-76E5-4AE5-8AB5-395AF9D18712}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Primitives", "ref/System.Reflection.Primitives.csproj", "{F512184F-76E5-4AE5-8AB5-395AF9D18712}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
@@ -19,10 +19,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Reflection.Primitives/src/Configurations.props b/src/System.Reflection.Primitives/src/Configurations.props
index 2d2c47cf24da..bf2603e34d53 100644
--- a/src/System.Reflection.Primitives/src/Configurations.props
+++ b/src/System.Reflection.Primitives/src/Configurations.props
@@ -1,11 +1,12 @@
+
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
- netcoreapp1.2corert;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
index c6d91c05f490..5ab0ad784c17 100644
--- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
+++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
@@ -7,10 +7,10 @@
{CCE47F37-2C51-44EB-8F54-0474D7831515}
-
-
-
-
+
+
+
+
diff --git a/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
index 6762ab6efe31..4a54cb1006f5 100644
--- a/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
+++ b/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions.Tests", "tests\System.Reflection.TypeExtensions.Tests.csproj", "{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions.Tests", "tests/System.Reflection.TypeExtensions.Tests.csproj", "{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}"
ProjectSection(ProjectDependencies) = postProject
{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB} = {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions.CoreCLR.Tests", "tests\CoreCLR\System.Reflection.TypeExtensions.CoreCLR.Tests.csproj", "{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions.CoreCLR.Tests", "tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj", "{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}"
ProjectSection(ProjectDependencies) = postProject
{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB} = {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions", "src\System.Reflection.TypeExtensions.csproj", "{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions", "src/System.Reflection.TypeExtensions.csproj", "{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}"
ProjectSection(ProjectDependencies) = postProject
{C303A051-8D54-4460-8BFD-DE10F0473BDB} = {C303A051-8D54-4460-8BFD-DE10F0473BDB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions", "ref\System.Reflection.TypeExtensions.csproj", "{C303A051-8D54-4460-8BFD-DE10F0473BDB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TypeExtensions", "ref/System.Reflection.TypeExtensions.csproj", "{C303A051-8D54-4460-8BFD-DE10F0473BDB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -39,10 +39,10 @@ Global
{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.Build.0 = Release|Any CPU
- {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Reflection.TypeExtensions/src/Configurations.props b/src/System.Reflection.TypeExtensions/src/Configurations.props
index 46ab240695a7..f9b8242235a4 100644
--- a/src/System.Reflection.TypeExtensions/src/Configurations.props
+++ b/src/System.Reflection.TypeExtensions/src/Configurations.props
@@ -4,7 +4,8 @@
netfx-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
index 79a99633b996..5dcda36dd498 100644
--- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
+++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
@@ -7,10 +7,12 @@
{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}
+
+
+
+
-
-
@@ -22,7 +24,7 @@
-
+
\ No newline at end of file
diff --git a/src/System.Reflection/System.Reflection.sln b/src/System.Reflection/System.Reflection.sln
index b9fbaa1427fc..285a953efc00 100644
--- a/src/System.Reflection/System.Reflection.sln
+++ b/src/System.Reflection/System.Reflection.sln
@@ -2,27 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Tests", "tests\System.Reflection.Tests.csproj", "{B027C72E-F04E-42E0-A7F7-993AEF8400D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Tests", "tests/System.Reflection.Tests.csproj", "{B027C72E-F04E-42E0-A7F7-993AEF8400D2}"
ProjectSection(ProjectDependencies) = postProject
{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.CoreCLR.Tests", "tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj", "{C8049356-559D-4F34-AC17-56F3AE62C897}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TestExe", "tests/TestExe/System.Reflection.TestExe.csproj", "{8C19B991-41E9-4B38-9602-E19375397F1D}"
ProjectSection(ProjectDependencies) = postProject
{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TestExe", "tests\TestExe\System.Reflection.TestExe.csproj", "{8C19B991-41E9-4B38-9602-E19375397F1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.CoreCLR.Tests", "tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj", "{C8049356-559D-4F34-AC17-56F3AE62C897}"
ProjectSection(ProjectDependencies) = postProject
{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection", "src\System.Reflection.csproj", "{68F87E68-E13F-4354-A6D6-B44727FE53EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection", "src/System.Reflection.csproj", "{68F87E68-E13F-4354-A6D6-B44727FE53EE}"
ProjectSection(ProjectDependencies) = postProject
{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6} = {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection", "ref\System.Reflection.csproj", "{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection", "ref/System.Reflection.csproj", "{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -40,18 +40,18 @@ Global
{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.Build.0 = Release|Any CPU
{8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.Build.0 = Release|Any CPU
+ {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -62,8 +62,8 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B027C72E-F04E-42E0-A7F7-993AEF8400D2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {C8049356-559D-4F34-AC17-56F3AE62C897} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{8C19B991-41E9-4B38-9602-E19375397F1D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {C8049356-559D-4F34-AC17-56F3AE62C897} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Reflection/src/Configurations.props b/src/System.Reflection/src/Configurations.props
index dcb70afd11c0..4c3df1a7d7d6 100644
--- a/src/System.Reflection/src/Configurations.props
+++ b/src/System.Reflection/src/Configurations.props
@@ -4,7 +4,8 @@
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj
index aa3f39d8436d..2183e4997705 100644
--- a/src/System.Reflection/src/System.Reflection.csproj
+++ b/src/System.Reflection/src/System.Reflection.csproj
@@ -7,8 +7,10 @@
{68F87E68-E13F-4354-A6D6-B44727FE53EE}
-
-
+
+
+
+
diff --git a/src/System.Resources.Reader/System.Resources.Reader.sln b/src/System.Resources.Reader/System.Resources.Reader.sln
index b67d514152a6..d180ac40d0e1 100644
--- a/src/System.Resources.Reader/System.Resources.Reader.sln
+++ b/src/System.Resources.Reader/System.Resources.Reader.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests.csproj", "{8D7202E8-084A-4C20-AB93-3BF70D2E0651}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader.Tests", "tests/System.Resources.Reader.Tests.csproj", "{8D7202E8-084A-4C20-AB93-3BF70D2E0651}"
ProjectSection(ProjectDependencies) = postProject
{5C13260D-C55D-46AF-9DCB-1B015D48E2E4} = {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader", "src\System.Resources.Reader.csproj", "{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader", "src/System.Resources.Reader.csproj", "{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}"
ProjectSection(ProjectDependencies) = postProject
{99A66A70-7055-48FC-9BE1-36ED2B392E0D} = {99A66A70-7055-48FC-9BE1-36ED2B392E0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader", "ref\System.Resources.Reader.csproj", "{99A66A70-7055-48FC-9BE1-36ED2B392E0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Reader", "ref/System.Resources.Reader.csproj", "{99A66A70-7055-48FC-9BE1-36ED2B392E0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Resources.ResourceManager/System.Resources.ResourceManager.sln b/src/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
index 1af4290af7ff..75bb15e03551 100644
--- a/src/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
+++ b/src/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests.csproj", "{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager.Tests", "tests/System.Resources.ResourceManager.Tests.csproj", "{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}"
ProjectSection(ProjectDependencies) = postProject
{3E7810B2-2802-4867-B223-30427F3F2D5B} = {3E7810B2-2802-4867-B223-30427F3F2D5B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager", "src\System.Resources.ResourceManager.csproj", "{3E7810B2-2802-4867-B223-30427F3F2D5B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager", "src/System.Resources.ResourceManager.csproj", "{3E7810B2-2802-4867-B223-30427F3F2D5B}"
ProjectSection(ProjectDependencies) = postProject
{97CFE337-C57E-4B2E-B495-65B917E1282E} = {97CFE337-C57E-4B2E-B495-65B917E1282E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager", "ref\System.Resources.ResourceManager.csproj", "{97CFE337-C57E-4B2E-B495-65B917E1282E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.ResourceManager", "ref/System.Resources.ResourceManager.csproj", "{97CFE337-C57E-4B2E-B495-65B917E1282E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Resources.ResourceManager/src/Configurations.props b/src/System.Resources.ResourceManager/src/Configurations.props
index dcb70afd11c0..4c3df1a7d7d6 100644
--- a/src/System.Resources.ResourceManager/src/Configurations.props
+++ b/src/System.Resources.ResourceManager/src/Configurations.props
@@ -4,7 +4,8 @@
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
index a6a8b8ca0dad..cefe71aaaa42 100644
--- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
+++ b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
@@ -10,8 +10,10 @@
{3E7810B2-2802-4867-B223-30427F3F2D5B}
-
-
+
+
+
+
@@ -38,4 +40,4 @@
-
+
\ No newline at end of file
diff --git a/src/System.Resources.Writer/System.Resources.Writer.sln b/src/System.Resources.Writer/System.Resources.Writer.sln
index d0ff74cff263..c6f7c2364737 100644
--- a/src/System.Resources.Writer/System.Resources.Writer.sln
+++ b/src/System.Resources.Writer/System.Resources.Writer.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer.Tests", "tests\System.Resources.Writer.Tests.csproj", "{EFA745C2-3741-4D54-B2A1-1979E43354E4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer.Tests", "tests/System.Resources.Writer.Tests.csproj", "{EFA745C2-3741-4D54-B2A1-1979E43354E4}"
ProjectSection(ProjectDependencies) = postProject
{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6} = {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer", "src\System.Resources.Writer.csproj", "{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer", "src/System.Resources.Writer.csproj", "{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}"
ProjectSection(ProjectDependencies) = postProject
{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3} = {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer", "ref\System.Resources.Writer.csproj", "{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Resources.Writer", "ref/System.Resources.Writer.csproj", "{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln b/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
index 4d91d68065ea..ba0da3a190c4 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
+++ b/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}"
ProjectSection(ProjectDependencies) = postProject
{04BA3E3C-6979-4792-B19E-C797AD607F42} = {04BA3E3C-6979-4792-B19E-C797AD607F42}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.Unsafe", "src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.Unsafe", "src/System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln b/src/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
index 7d4af517f10a..9706498a4867 100644
--- a/src/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
+++ b/src/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.VisualC", "src\System.Runtime.CompilerServices.VisualC.csproj", "{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.VisualC", "src/System.Runtime.CompilerServices.VisualC.csproj", "{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}"
ProjectSection(ProjectDependencies) = postProject
{2122228D-ADAD-43D8-BC56-6A061DE8B25C} = {2122228D-ADAD-43D8-BC56-6A061DE8B25C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.VisualC", "ref\System.Runtime.CompilerServices.VisualC.csproj", "{2122228D-ADAD-43D8-BC56-6A061DE8B25C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CompilerServices.VisualC", "ref/System.Runtime.CompilerServices.VisualC.csproj", "{2122228D-ADAD-43D8-BC56-6A061DE8B25C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln
index 1dc16ea74c58..6007a993757f 100644
--- a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln
+++ b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln
@@ -2,42 +2,42 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions.Tests", "tests\System.Runtime.Extensions.Tests.csproj", "{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions.Tests", "tests/System.Runtime.Extensions.Tests.csproj", "{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyResolveTests", "tests\AssemblyResolveTests\AssemblyResolveTests.csproj", "ad83807c-8be5-4f27-85df-9793613233e1"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoidMainWithExitCodeApp", "tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj", "{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions.Performance.Tests", "tests\Performance\System.Runtime.Extensions.Performance.Tests.csproj", "{978FA427-F87B-46E2-B276-F5B727C50A01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAppOutsideOfTPA", "tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj", "{C44B33E3-F89F-40B9-B353-D380C1524988}"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "tests\TestApp\TestApp.csproj", "{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "tests/TestApp/TestApp.csproj", "{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAppOutsideOfTPA", "tests\TestAppOutsideOfTPA\TestAppOutsideOfTPA.csproj", "{C44B33E3-F89F-40B9-B353-D380C1524988}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions.Performance.Tests", "tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj", "{978FA427-F87B-46E2-B276-F5B727C50A01}"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoidMainWithExitCodeApp", "tests\VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj", "{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyResolveTests", "tests/AssemblyResolveTests/AssemblyResolveTests.csproj", "ad83807c-8be5-4f27-85df-9793613233e1"
ProjectSection(ProjectDependencies) = postProject
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions", "src\System.Runtime.Extensions.csproj", "{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions", "src/System.Runtime.Extensions.csproj", "{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}"
ProjectSection(ProjectDependencies) = postProject
{33B27785-02FD-4544-8E7D-EB802248BEC3} = {33B27785-02FD-4544-8E7D-EB802248BEC3}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions", "ref\System.Runtime.Extensions.csproj", "{33B27785-02FD-4544-8E7D-EB802248BEC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions", "ref/System.Runtime.Extensions.csproj", "{33B27785-02FD-4544-8E7D-EB802248BEC3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -55,26 +55,26 @@ Global
{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
- ad83807c-8be5-4f27-85df-9793613233e1.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- ad83807c-8be5-4f27-85df-9793613233e1.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {978FA427-F87B-46E2-B276-F5B727C50A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {978FA427-F87B-46E2-B276-F5B727C50A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {978FA427-F87B-46E2-B276-F5B727C50A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {978FA427-F87B-46E2-B276-F5B727C50A01}.Release|Any CPU.Build.0 = Release|Any CPU
- {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {978FA427-F87B-46E2-B276-F5B727C50A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {978FA427-F87B-46E2-B276-F5B727C50A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {978FA427-F87B-46E2-B276-F5B727C50A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {978FA427-F87B-46E2-B276-F5B727C50A01}.Release|Any CPU.Build.0 = Release|Any CPU
+ ad83807c-8be5-4f27-85df-9793613233e1.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ ad83807c-8be5-4f27-85df-9793613233e1.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -89,11 +89,11 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- ad83807c-8be5-4f27-85df-9793613233e1 = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {978FA427-F87B-46E2-B276-F5B727C50A01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {C44B33E3-F89F-40B9-B353-D380C1524988} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{9F312D76-9AF1-4E90-B3B0-815A1EC6C346} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {C44B33E3-F89F-40B9-B353-D380C1524988} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {978FA427-F87B-46E2-B276-F5B727C50A01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ ad83807c-8be5-4f27-85df-9793613233e1 = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{33B27785-02FD-4544-8E7D-EB802248BEC3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Runtime.Extensions/src/Configurations.props b/src/System.Runtime.Extensions/src/Configurations.props
index 653513c18655..dddbf038d2a4 100644
--- a/src/System.Runtime.Extensions/src/Configurations.props
+++ b/src/System.Runtime.Extensions/src/Configurations.props
@@ -1,13 +1,12 @@
+
netcoreapp-Unix;
netcoreapp-Windows_NT;
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp1.2corert-Unix;
- netcoreapp1.2corert-Windows_NT;
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index 66cad43902c6..b801f995efd8 100644
--- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -7,7 +7,7 @@
Library
true
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
0436
true
@@ -17,10 +17,6 @@
-
-
-
-
@@ -337,4 +333,4 @@
-
+
\ No newline at end of file
diff --git a/src/System.Runtime.Handles/System.Runtime.Handles.sln b/src/System.Runtime.Handles/System.Runtime.Handles.sln
index df7ecb77a61d..abe244c9b652 100644
--- a/src/System.Runtime.Handles/System.Runtime.Handles.sln
+++ b/src/System.Runtime.Handles/System.Runtime.Handles.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests.csproj", "{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles.Tests", "tests/System.Runtime.Handles.Tests.csproj", "{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}"
ProjectSection(ProjectDependencies) = postProject
{D85EE71C-F05B-4331-9300-8E2833D49E19} = {D85EE71C-F05B-4331-9300-8E2833D49E19}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles", "src\System.Runtime.Handles.csproj", "{D85EE71C-F05B-4331-9300-8E2833D49E19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles", "src/System.Runtime.Handles.csproj", "{D85EE71C-F05B-4331-9300-8E2833D49E19}"
ProjectSection(ProjectDependencies) = postProject
{46C4C03C-3055-4E97-858B-3E83CB862262} = {46C4C03C-3055-4E97-858B-3E83CB862262}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles", "ref\System.Runtime.Handles.csproj", "{46C4C03C-3055-4E97-858B-3E83CB862262}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Handles", "ref/System.Runtime.Handles.csproj", "{46C4C03C-3055-4E97-858B-3E83CB862262}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln b/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
index 0ad13ec0271f..830c17b59c12 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}"
ProjectSection(ProjectDependencies) = postProject
{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2} = {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation", "src\System.Runtime.InteropServices.RuntimeInformation.csproj", "{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation", "src/System.Runtime.InteropServices.RuntimeInformation.csproj", "{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}"
ProjectSection(ProjectDependencies) = postProject
{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7} = {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation", "ref\System.Runtime.InteropServices.RuntimeInformation.csproj", "{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.RuntimeInformation", "ref/System.Runtime.InteropServices.RuntimeInformation.csproj", "{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
index c398e42e8994..129adad32f9c 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props
@@ -3,6 +3,7 @@
netstandard;
+ netstandard1.0;
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
index 13194f29052b..fee91261b087 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -6,8 +6,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index 5f0d41d100f6..f66881910a49 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -12,6 +12,8 @@
uap
uap;uapaot;netcore50
true
+
+ $(RefRootPath)/netstandard1.1
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln b/src/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
index 5cabcf4ac591..d04151210464 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.WindowsRuntime", "src\System.Runtime.InteropServices.WindowsRuntime.csproj", "{5655C5E4-9B76-489B-87AF-42BD60570A00}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.WindowsRuntime", "src/System.Runtime.InteropServices.WindowsRuntime.csproj", "{5655C5E4-9B76-489B-87AF-42BD60570A00}"
ProjectSection(ProjectDependencies) = postProject
{DC485335-D0D7-4E28-9593-445B7B6BEFA7} = {DC485335-D0D7-4E28-9593-445B7B6BEFA7}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.WindowsRuntime", "ref\System.Runtime.InteropServices.WindowsRuntime.csproj", "{DC485335-D0D7-4E28-9593-445B7B6BEFA7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.WindowsRuntime", "ref/System.Runtime.InteropServices.WindowsRuntime.csproj", "{DC485335-D0D7-4E28-9593-445B7B6BEFA7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
index a7b704aed870..1779095e5fa1 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
@@ -2,7 +2,6 @@
- netcore50aot-Windows_NT;
uapaot-Windows_NT;
netcoreapp-Windows_NT;
netcoreapp;
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
index 4a6a5abeec0e..848e1d3e561f 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -7,8 +7,6 @@
{5655C5E4-9B76-489B-87AF-42BD60570A00}
-
-
@@ -21,7 +19,8 @@
-
+
+
diff --git a/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
index c68e37410f02..0d07c647e0b6 100644
--- a/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
+++ b/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.Tests", "tests\System.Runtime.InteropServices.Tests.csproj", "{A824F4CD-935B-4496-A1B2-C3664936DA7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.Tests", "tests/System.Runtime.InteropServices.Tests.csproj", "{A824F4CD-935B-4496-A1B2-C3664936DA7B}"
ProjectSection(ProjectDependencies) = postProject
{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE} = {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices", "src\System.Runtime.InteropServices.csproj", "{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices", "src/System.Runtime.InteropServices.csproj", "{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}"
ProjectSection(ProjectDependencies) = postProject
{B17014F1-D902-417F-89B0-271204695831} = {B17014F1-D902-417F-89B0-271204695831}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices", "ref\System.Runtime.InteropServices.csproj", "{B17014F1-D902-417F-89B0-271204695831}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices", "ref/System.Runtime.InteropServices.csproj", "{B17014F1-D902-417F-89B0-271204695831}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Runtime.InteropServices/src/Configurations.props b/src/System.Runtime.InteropServices/src/Configurations.props
index 123771be84f5..88a7f077a683 100644
--- a/src/System.Runtime.InteropServices/src/Configurations.props
+++ b/src/System.Runtime.InteropServices/src/Configurations.props
@@ -1,11 +1,12 @@
+
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
- netcoreapp1.2corert;
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index 3525fe3043a2..381c931e1af4 100644
--- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -11,10 +11,10 @@
None
-
-
-
-
+
+
+
+
@@ -55,4 +55,4 @@
-
+
\ No newline at end of file
diff --git a/src/System.Runtime.Loader/System.Runtime.Loader.sln b/src/System.Runtime.Loader/System.Runtime.Loader.sln
index 305b30df151c..9d5173d553e7 100644
--- a/src/System.Runtime.Loader/System.Runtime.Loader.sln
+++ b/src/System.Runtime.Loader/System.Runtime.Loader.sln
@@ -2,37 +2,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Tests", "tests\System.Runtime.Loader.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Tests", "tests/System.Runtime.Loader.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}"
ProjectSection(ProjectDependencies) = postProject
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.DefaultContext.Tests", "tests\DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Test.Assembly", "tests/System.Runtime.Loader.Test.Assembly/System.Runtime.Loader.Test.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A56}"
ProjectSection(ProjectDependencies) = postProject
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.RefEmitLoadContext.Tests", "tests\RefEmitLoadContext\System.Runtime.Loader.RefEmitLoadContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Noop.Assembly", "tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A57}"
ProjectSection(ProjectDependencies) = postProject
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Noop.Assembly", "tests\System.Runtime.Loader.Noop.Assembly\System.Runtime.Loader.Noop.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.RefEmitLoadContext.Tests", "tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}"
ProjectSection(ProjectDependencies) = postProject
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.Test.Assembly", "tests\System.Runtime.Loader.Test.Assembly\System.Runtime.Loader.Test.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A56}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader.DefaultContext.Tests", "tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}"
ProjectSection(ProjectDependencies) = postProject
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader", "src\System.Runtime.Loader.csproj", "{485A65F0-51C9-4B95-A7A8-A4860C231E67}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader", "src/System.Runtime.Loader.csproj", "{485A65F0-51C9-4B95-A7A8-A4860C231E67}"
ProjectSection(ProjectDependencies) = postProject
{FB507A82-ACDD-4809-A030-6F9372A71194} = {FB507A82-ACDD-4809-A030-6F9372A71194}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader", "ref\System.Runtime.Loader.csproj", "{FB507A82-ACDD-4809-A030-6F9372A71194}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Loader", "ref/System.Runtime.Loader.csproj", "{FB507A82-ACDD-4809-A030-6F9372A71194}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -50,26 +50,26 @@ Global
{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.Build.0 = Release|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.Build.0 = Release|Any CPU
- {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = Release|Any CPU
{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.Build.0 = Release|Any CPU
- {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -80,10 +80,10 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{701CB3BC-00DC-435D-BDE4-C5FC29A708A7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {701CB3BC-00DC-435D-BDE4-C5FC29A708A9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {396D6EBF-60BD-4DAF-8783-FB403E070A57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{396D6EBF-60BD-4DAF-8783-FB403E070A56} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {396D6EBF-60BD-4DAF-8783-FB403E070A57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {701CB3BC-00DC-435D-BDE4-C5FC29A708A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{FB507A82-ACDD-4809-A030-6F9372A71194} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Runtime.Loader/src/Configurations.props b/src/System.Runtime.Loader/src/Configurations.props
index 262829acbcc2..4e9b1a0bfd13 100644
--- a/src/System.Runtime.Loader/src/Configurations.props
+++ b/src/System.Runtime.Loader/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
diff --git a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj
index 82270251c9be..00a41cbbdfe8 100644
--- a/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj
+++ b/src/System.Runtime.Loader/src/System.Runtime.Loader.csproj
@@ -4,12 +4,14 @@
System.Runtime.Loader
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
{485A65F0-51C9-4B95-A7A8-A4860C231E67}
-
-
+
+
+
+
diff --git a/src/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/System.Runtime.Numerics/System.Runtime.Numerics.sln
index 51adbe2656d8..64242b2225be 100644
--- a/src/System.Runtime.Numerics/System.Runtime.Numerics.sln
+++ b/src/System.Runtime.Numerics/System.Runtime.Numerics.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics.Tests", "tests\System.Runtime.Numerics.Tests.csproj", "{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics.Tests", "tests/System.Runtime.Numerics.Tests.csproj", "{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}"
ProjectSection(ProjectDependencies) = postProject
{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} = {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics", "src\System.Runtime.Numerics.csproj", "{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics", "src/System.Runtime.Numerics.csproj", "{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}"
ProjectSection(ProjectDependencies) = postProject
{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F} = {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics", "ref\System.Runtime.Numerics.csproj", "{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Numerics", "ref/System.Runtime.Numerics.csproj", "{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln b/src/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
index c76c3b3c3f99..51a8b6a661fe 100644
--- a/src/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
+++ b/src/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters.Tests", "tests\System.Runtime.Serialization.Formatters.Tests.csproj", "{13CE5E71-D373-4EA6-B3CB-166FF089A42A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters.Tests", "tests/System.Runtime.Serialization.Formatters.Tests.csproj", "{13CE5E71-D373-4EA6-B3CB-166FF089A42A}"
ProjectSection(ProjectDependencies) = postProject
{CF80D24A-787A-43DB-B9E7-10BCA02D10EA} = {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters", "src\System.Runtime.Serialization.Formatters.csproj", "{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters", "src/System.Runtime.Serialization.Formatters.csproj", "{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}"
ProjectSection(ProjectDependencies) = postProject
{4413B319-3D48-4516-A45B-375F4650EF0D} = {4413B319-3D48-4516-A45B-375F4650EF0D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters", "ref\System.Runtime.Serialization.Formatters.csproj", "{4413B319-3D48-4516-A45B-375F4650EF0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Formatters", "ref/System.Runtime.Serialization.Formatters.csproj", "{4413B319-3D48-4516-A45B-375F4650EF0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
index 0ea582da95f4..18988e3730e5 100644
--- a/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
+++ b/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
@@ -2,27 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.Tests", "tests\System.Runtime.Serialization.Json.Tests.csproj", "{173F6978-B961-4D1C-84E4-06468772D019}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.Tests", "tests/System.Runtime.Serialization.Json.Tests.csproj", "{173F6978-B961-4D1C-84E4-06468772D019}"
ProjectSection(ProjectDependencies) = postProject
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.Performance.Tests", "tests\Performance\System.Runtime.Serialization.Json.Performance.Tests.csproj", "{F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.ReflectionOnly.Tests", "tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj", "{C99A835E-46F3-4C05-AD34-7DD84FB7466B}"
ProjectSection(ProjectDependencies) = postProject
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj", "{C99A835E-46F3-4C05-AD34-7DD84FB7466B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.Performance.Tests", "tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj", "{F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}"
ProjectSection(ProjectDependencies) = postProject
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json", "src\System.Runtime.Serialization.Json.csproj", "{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json", "src/System.Runtime.Serialization.Json.csproj", "{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}"
ProjectSection(ProjectDependencies) = postProject
{5119E88F-FA73-4FC6-A327-DD7C77E746BC} = {5119E88F-FA73-4FC6-A327-DD7C77E746BC}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json", "ref\System.Runtime.Serialization.Json.csproj", "{5119E88F-FA73-4FC6-A327-DD7C77E746BC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json", "ref/System.Runtime.Serialization.Json.csproj", "{5119E88F-FA73-4FC6-A327-DD7C77E746BC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -40,14 +40,14 @@ Global
{173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Release|Any CPU.Build.0 = Release|Any CPU
{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}.Release|Any CPU.Build.0 = Release|Any CPU
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -62,8 +62,8 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{173F6978-B961-4D1C-84E4-06468772D019} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{C99A835E-46F3-4C05-AD34-7DD84FB7466B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {F6836E5C-BFA0-4E92-ADEE-87E797D7C90C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{5119E88F-FA73-4FC6-A327-DD7C77E746BC} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln b/src/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
index 165846f8b340..f0f1f5629edd 100644
--- a/src/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
+++ b/src/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Primitives", "src\System.Runtime.Serialization.Primitives.csproj", "{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Primitives", "src/System.Runtime.Serialization.Primitives.csproj", "{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}"
ProjectSection(ProjectDependencies) = postProject
{7E73C175-98C7-471B-B1A4-998C20F58854} = {7E73C175-98C7-471B-B1A4-998C20F58854}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Primitives", "ref\System.Runtime.Serialization.Primitives.csproj", "{7E73C175-98C7-471B-B1A4-998C20F58854}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Primitives", "ref/System.Runtime.Serialization.Primitives.csproj", "{7E73C175-98C7-471B-B1A4-998C20F58854}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Runtime.Serialization.Primitives/src/Configurations.props b/src/System.Runtime.Serialization.Primitives/src/Configurations.props
index 6500b3cabdbe..083bbc7b5858 100644
--- a/src/System.Runtime.Serialization.Primitives/src/Configurations.props
+++ b/src/System.Runtime.Serialization.Primitives/src/Configurations.props
@@ -2,7 +2,6 @@
- netcore50aot-Windows_NT;
uapaot-Windows_NT;
uap-Windows_NT;
netfx-Windows_NT;
diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
index a52a188b59a7..c85be34eaa1e 100644
--- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
+++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -12,12 +12,10 @@
true
-
-
-
-
+
+
diff --git a/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
index 0624308f2593..c3326da261e5 100644
--- a/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
+++ b/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
@@ -2,27 +2,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.Tests", "tests\System.Runtime.Serialization.Xml.Tests.csproj", "{30CAB353-089E-4294-B23B-F2DD1D945654}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.Tests", "tests/System.Runtime.Serialization.Xml.Tests.csproj", "{30CAB353-089E-4294-B23B-F2DD1D945654}"
ProjectSection(ProjectDependencies) = postProject
{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.Performance.Tests", "tests\Performance\System.Runtime.Serialization.Xml.Performance.Tests.csproj", "{122A5432-C5B7-4293-AFDA-B24F4D54FDEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.ReflectionOnly.Tests", "tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj", "{38889701-0af4-48b3-999c-e99d639c61b6}"
ProjectSection(ProjectDependencies) = postProject
{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj", "{38889701-0af4-48b3-999c-e99d639c61b6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.Performance.Tests", "tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj", "{122A5432-C5B7-4293-AFDA-B24F4D54FDEF}"
ProjectSection(ProjectDependencies) = postProject
{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml", "src\System.Runtime.Serialization.Xml.csproj", "{9D747A18-C8FD-4D7A-8913-4ED7911683B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml", "src/System.Runtime.Serialization.Xml.csproj", "{9D747A18-C8FD-4D7A-8913-4ED7911683B4}"
ProjectSection(ProjectDependencies) = postProject
{025743B4-6E1E-4602-BE7F-1E479CC8EEBE} = {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml", "ref\System.Runtime.Serialization.Xml.csproj", "{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml", "ref/System.Runtime.Serialization.Xml.csproj", "{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -40,14 +40,14 @@ Global
{30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Release|Any CPU.Build.0 = Release|Any CPU
{38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {122A5432-C5B7-4293-AFDA-B24F4D54FDEF}.Release|Any CPU.Build.0 = Release|Any CPU
{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -62,8 +62,8 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{30CAB353-089E-4294-B23B-F2DD1D945654} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {122A5432-C5B7-4293-AFDA-B24F4D54FDEF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{38889701-0af4-48b3-999c-e99d639c61b6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {122A5432-C5B7-4293-AFDA-B24F4D54FDEF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{025743B4-6E1E-4602-BE7F-1E479CC8EEBE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln b/src/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
index ccff63d10e97..d2e6ccb0ed01 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/System.Runtime.WindowsRuntime.UI.Xaml.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime.UI.Xaml", "src\System.Runtime.WindowsRuntime.UI.Xaml.csproj", "{263DA4F1-C3BC-4B43-98E7-9F38B419A131}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime.UI.Xaml", "src/System.Runtime.WindowsRuntime.UI.Xaml.csproj", "{263DA4F1-C3BC-4B43-98E7-9F38B419A131}"
ProjectSection(ProjectDependencies) = postProject
{AA1600B8-C4D3-42A9-A28A-04D0C8282566} = {AA1600B8-C4D3-42A9-A28A-04D0C8282566}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime.UI.Xaml", "ref\System.Runtime.WindowsRuntime.UI.Xaml.csproj", "{AA1600B8-C4D3-42A9-A28A-04D0C8282566}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime.UI.Xaml", "ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj", "{AA1600B8-C4D3-42A9-A28A-04D0C8282566}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln b/src/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
index 81341f7f9b47..24ac2d7db5bb 100644
--- a/src/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
+++ b/src/System.Runtime.WindowsRuntime/System.Runtime.WindowsRuntime.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime", "src\System.Runtime.WindowsRuntime.csproj", "{844A2A0B-4169-49C3-B367-AFDC4894E487}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime", "src/System.Runtime.WindowsRuntime.csproj", "{844A2A0B-4169-49C3-B367-AFDC4894E487}"
ProjectSection(ProjectDependencies) = postProject
{FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA} = {FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime", "ref\System.Runtime.WindowsRuntime.csproj", "{FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.WindowsRuntime", "ref/System.Runtime.WindowsRuntime.csproj", "{FDDA3E4A-B182-4CD1-B624-EBD72D8A05DA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Runtime/System.Runtime.sln b/src/System.Runtime/System.Runtime.sln
index ef86ff7d3d79..9b1dbbed711c 100644
--- a/src/System.Runtime/System.Runtime.sln
+++ b/src/System.Runtime/System.Runtime.sln
@@ -2,37 +2,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Tests", "tests\System.Runtime.Tests.csproj", "{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Tests", "tests/System.Runtime.Tests.csproj", "{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}"
ProjectSection(ProjectDependencies) = postProject
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Performance.Tests", "tests\Performance\System.Runtime.Performance.Tests.csproj", "{E9560F70-79F5-453A-B518-0292CFE4A6AD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TestModule", "tests/TestModule/System.Reflection.TestModule.ilproj", "{3B7489C4-65DB-4E69-BE01-F6234133400C}"
ProjectSection(ProjectDependencies) = postProject
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "tests\TestAssembly\TestAssembly.csproj", "{2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLoadAssembly", "tests/TestLoadAssembly/TestLoadAssembly.csproj", "{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}"
ProjectSection(ProjectDependencies) = postProject
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLoadAssembly", "tests\TestLoadAssembly\TestLoadAssembly.csproj", "{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "tests/TestAssembly/TestAssembly.csproj", "{2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}"
ProjectSection(ProjectDependencies) = postProject
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.TestModule", "tests\TestModule\System.Reflection.TestModule.ilproj", "{3B7489C4-65DB-4E69-BE01-F6234133400C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Performance.Tests", "tests/Performance/System.Runtime.Performance.Tests.csproj", "{E9560F70-79F5-453A-B518-0292CFE4A6AD}"
ProjectSection(ProjectDependencies) = postProject
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime", "src\System.Runtime.csproj", "{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime", "src/System.Runtime.csproj", "{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}"
ProjectSection(ProjectDependencies) = postProject
{ADBCF120-3454-4A3C-9D1D-AC4293E795D6} = {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime", "ref\System.Runtime.csproj", "{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime", "ref/System.Runtime.csproj", "{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -50,22 +50,22 @@ Global
{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
- {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Release|Any CPU.Build.0 = Release|Any CPU
- {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
- {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
- {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
- {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{3B7489C4-65DB-4E69-BE01-F6234133400C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B7489C4-65DB-4E69-BE01-F6234133400C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B7489C4-65DB-4E69-BE01-F6234133400C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B7489C4-65DB-4E69-BE01-F6234133400C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
+ {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
+ {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
+ {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
+ {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E9560F70-79F5-453A-B518-0292CFE4A6AD}.Release|Any CPU.Build.0 = Release|Any CPU
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
@@ -80,10 +80,10 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {E9560F70-79F5-453A-B518-0292CFE4A6AD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
- {71DE1A1F-F8E2-452A-9D54-0385F6099DD3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{3B7489C4-65DB-4E69-BE01-F6234133400C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {71DE1A1F-F8E2-452A-9D54-0385F6099DD3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {2EF7D710-A7BD-4BB3-8EF6-3F0298CD4986} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+ {E9560F70-79F5-453A-B518-0292CFE4A6AD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{ADBCF120-3454-4A3C-9D1D-AC4293E795D6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
diff --git a/src/System.Runtime/src/Configurations.props b/src/System.Runtime/src/Configurations.props
index 2fc9c2bb22dc..4620475113ed 100644
--- a/src/System.Runtime/src/Configurations.props
+++ b/src/System.Runtime/src/Configurations.props
@@ -1,9 +1,9 @@
+
uapaot-Windows_NT;
- netcoreapp1.2corert-Windows_NT;
netcoreapp-Windows_NT;
netcoreapp-Unix;
uap-Windows_NT;
diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj
index 781412acf3a7..7724979b6c2c 100644
--- a/src/System.Runtime/src/System.Runtime.csproj
+++ b/src/System.Runtime/src/System.Runtime.csproj
@@ -12,8 +12,6 @@
-
-
diff --git a/src/System.Security.AccessControl/System.Security.AccessControl.sln b/src/System.Security.AccessControl/System.Security.AccessControl.sln
index 3529cd0c4d23..dabf4bbe6858 100644
--- a/src/System.Security.AccessControl/System.Security.AccessControl.sln
+++ b/src/System.Security.AccessControl/System.Security.AccessControl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{70FAC855-CAC6-4523-8477-880548D58A1B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl.Tests", "tests/System.Security.AccessControl.Tests.csproj", "{70FAC855-CAC6-4523-8477-880548D58A1B}"
ProjectSection(ProjectDependencies) = postProject
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D} = {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "src\System.Security.AccessControl.csproj", "{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "src/System.Security.AccessControl.csproj", "{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}"
ProjectSection(ProjectDependencies) = postProject
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F} = {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "ref\System.Security.AccessControl.csproj", "{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "ref/System.Security.AccessControl.csproj", "{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Claims/System.Security.Claims.sln b/src/System.Security.Claims/System.Security.Claims.sln
index 15ac2b91e10a..c8203d63d45f 100644
--- a/src/System.Security.Claims/System.Security.Claims.sln
+++ b/src/System.Security.Claims/System.Security.Claims.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims.Tests", "tests\System.Security.Claims.Tests.csproj", "{BE8B728D-86C1-406F-8F5F-6656EC486B01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims.Tests", "tests/System.Security.Claims.Tests.csproj", "{BE8B728D-86C1-406F-8F5F-6656EC486B01}"
ProjectSection(ProjectDependencies) = postProject
{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52} = {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims", "src\System.Security.Claims.csproj", "{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims", "src/System.Security.Claims.csproj", "{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}"
ProjectSection(ProjectDependencies) = postProject
{4372807C-BD21-476F-BCE2-3D192AC0B96C} = {4372807C-BD21-476F-BCE2-3D192AC0B96C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims", "ref\System.Security.Claims.csproj", "{4372807C-BD21-476F-BCE2-3D192AC0B96C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Claims", "ref/System.Security.Claims.csproj", "{4372807C-BD21-476F-BCE2-3D192AC0B96C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln b/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
index b32ea12627ca..d6e003b2e06d 100644
--- a/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
+++ b/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms.Tests", "tests\System.Security.Cryptography.Algorithms.Tests.csproj", "{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms.Tests", "tests/System.Security.Cryptography.Algorithms.Tests.csproj", "{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}"
ProjectSection(ProjectDependencies) = postProject
{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9} = {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms", "src\System.Security.Cryptography.Algorithms.csproj", "{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms", "src/System.Security.Cryptography.Algorithms.csproj", "{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}"
ProjectSection(ProjectDependencies) = postProject
{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F} = {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms", "ref\System.Security.Cryptography.Algorithms.csproj", "{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Algorithms", "ref/System.Security.Cryptography.Algorithms.csproj", "{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln b/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
index 48cf00973693..50439998faa7 100644
--- a/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
+++ b/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng.Tests", "tests\System.Security.Cryptography.Cng.Tests.csproj", "{FF53459F-66F7-4F00-8D36-DF440CE18419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng.Tests", "tests/System.Security.Cryptography.Cng.Tests.csproj", "{FF53459F-66F7-4F00-8D36-DF440CE18419}"
ProjectSection(ProjectDependencies) = postProject
{4C1BD451-6A99-45E7-9339-79C77C42EE9E} = {4C1BD451-6A99-45E7-9339-79C77C42EE9E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng", "src\System.Security.Cryptography.Cng.csproj", "{4C1BD451-6A99-45E7-9339-79C77C42EE9E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng", "src/System.Security.Cryptography.Cng.csproj", "{4C1BD451-6A99-45E7-9339-79C77C42EE9E}"
ProjectSection(ProjectDependencies) = postProject
{9FD12550-3A7C-49D3-9A1E-C4B7410989DD} = {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng", "ref\System.Security.Cryptography.Cng.csproj", "{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Cng", "ref/System.Security.Cryptography.Cng.csproj", "{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs
index 2888f3637325..a41d559c6cff 100644
--- a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs
+++ b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.cs
@@ -266,8 +266,10 @@ public DSACng(System.Security.Cryptography.CngKey key) { }
public override string SignatureAlgorithm { get { throw null; } }
protected override void Dispose(bool disposing) { }
public override System.Security.Cryptography.DSAParameters ExportParameters(bool includePrivateParameters) { throw null; }
+#if !netfx // types missing from netfx targeting pack
protected override byte[] HashData(byte[] data, int offset, int count, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; }
protected override byte[] HashData(System.IO.Stream data, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { throw null; }
+#endif
public override void ImportParameters(System.Security.Cryptography.DSAParameters parameters) { }
public override bool VerifySignature(byte[] rgbHash, byte[] rgbSignature) { throw null; }
}
diff --git a/src/System.Security.Cryptography.Cng/src/ApiCompatBaseline.netfx.txt b/src/System.Security.Cryptography.Cng/src/ApiCompatBaseline.netfx.txt
index 1c46326cbda8..ab5d7d656d95 100644
--- a/src/System.Security.Cryptography.Cng/src/ApiCompatBaseline.netfx.txt
+++ b/src/System.Security.Cryptography.Cng/src/ApiCompatBaseline.netfx.txt
@@ -1,12 +1,10 @@
# The .NET 4.6.3 targeting pack (1.0.1) doesn't have the new members added for ECDsa import/export yet.
+MembersMustExist : Member 'Microsoft.Win32.SafeHandles.SafeNCryptHandle..ctor(System.IntPtr, System.Runtime.InteropServices.SafeHandle)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Microsoft.Win32.SafeHandles.SafeNCryptKeyHandle..ctor(System.IntPtr, System.Runtime.InteropServices.SafeHandle)' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.AesCng' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Security.Cryptography.CngAlgorithm.ECDiffieHellman.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Security.Cryptography.CngAlgorithm.ECDsa.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Security.Cryptography.CngKeyBlobFormat.EccFullPrivateBlob.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Security.Cryptography.CngKeyBlobFormat.EccFullPublicBlob.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Security.Cryptography.ECDsaCng..ctor(System.Security.Cryptography.ECCurve)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Security.Cryptography.ECDsaCng.ExportExplicitParameters(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Security.Cryptography.ECDsaCng.ExportParameters(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Security.Cryptography.ECDsaCng.GenerateKey(System.Security.Cryptography.ECCurve)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Security.Cryptography.ECDsaCng.ImportParameters(System.Security.Cryptography.ECParameters)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'Microsoft.Win32.SafeHandles.SafeNCryptHandle..ctor(System.IntPtr, System.Runtime.InteropServices.SafeHandle)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'Microsoft.Win32.SafeHandles.SafeNCryptKeyHandle..ctor(System.IntPtr, System.Runtime.InteropServices.SafeHandle)' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.DSACng' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'System.Security.Cryptography.TripleDESCng' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
index b6b435456d84..16f3c562211e 100644
--- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
+++ b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
@@ -9,6 +9,7 @@
true
None
true
+ true
diff --git a/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln b/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
index fcb8325600ca..a4ef036c01b6 100644
--- a/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
+++ b/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp.Tests", "tests\System.Security.Cryptography.Csp.Tests.csproj", "{A05C2EF2-A986-448C-9C63-735CC17409AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp.Tests", "tests/System.Security.Cryptography.Csp.Tests.csproj", "{A05C2EF2-A986-448C-9C63-735CC17409AA}"
ProjectSection(ProjectDependencies) = postProject
{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E} = {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp", "src\System.Security.Cryptography.Csp.csproj", "{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp", "src/System.Security.Cryptography.Csp.csproj", "{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}"
ProjectSection(ProjectDependencies) = postProject
{FD10679A-8C98-42E6-B7E5-9424E5443912} = {FD10679A-8C98-42E6-B7E5-9424E5443912}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp", "ref\System.Security.Cryptography.Csp.csproj", "{FD10679A-8C98-42E6-B7E5-9424E5443912}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Csp", "ref/System.Security.Cryptography.Csp.csproj", "{FD10679A-8C98-42E6-B7E5-9424E5443912}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln b/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
index 91e3aaac7da9..4a995b05b685 100644
--- a/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
+++ b/src/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding.Tests", "tests\System.Security.Cryptography.Encoding.Tests.csproj", "{0581E9FA-D639-4B88-96D8-D092760F90B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding.Tests", "tests/System.Security.Cryptography.Encoding.Tests.csproj", "{0581E9FA-D639-4B88-96D8-D092760F90B0}"
ProjectSection(ProjectDependencies) = postProject
{AA81E343-5E54-40B0-9381-C459419BE780} = {AA81E343-5E54-40B0-9381-C459419BE780}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "src\System.Security.Cryptography.Encoding.csproj", "{AA81E343-5E54-40B0-9381-C459419BE780}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "src/System.Security.Cryptography.Encoding.csproj", "{AA81E343-5E54-40B0-9381-C459419BE780}"
ProjectSection(ProjectDependencies) = postProject
{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} = {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "ref\System.Security.Cryptography.Encoding.csproj", "{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Encoding", "ref/System.Security.Cryptography.Encoding.csproj", "{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln b/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
index e4df70686f28..ba0949ca470d 100644
--- a/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
+++ b/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl.Tests", "tests\System.Security.Cryptography.OpenSsl.Tests.csproj", "{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl.Tests", "tests/System.Security.Cryptography.OpenSsl.Tests.csproj", "{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}"
ProjectSection(ProjectDependencies) = postProject
{78452F3E-BA91-47E7-BB0F-02E8A5C116C4} = {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl", "src\System.Security.Cryptography.OpenSsl.csproj", "{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl", "src/System.Security.Cryptography.OpenSsl.csproj", "{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}"
ProjectSection(ProjectDependencies) = postProject
{8DEA82EF-2214-4295-8CC1-9FFB9B18838F} = {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl", "ref\System.Security.Cryptography.OpenSsl.csproj", "{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.OpenSsl", "ref/System.Security.Cryptography.OpenSsl.csproj", "{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln b/src/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
index f0d6bdedecf5..426205736a67 100644
--- a/src/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
+++ b/src/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs.Tests", "tests\System.Security.Cryptography.Pkcs.Tests.csproj", "{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs.Tests", "tests/System.Security.Cryptography.Pkcs.Tests.csproj", "{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}"
ProjectSection(ProjectDependencies) = postProject
{03D84CBD-896D-4B2F-9A22-07034F51E73D} = {03D84CBD-896D-4B2F-9A22-07034F51E73D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs", "src\System.Security.Cryptography.Pkcs.csproj", "{03D84CBD-896D-4B2F-9A22-07034F51E73D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs", "src/System.Security.Cryptography.Pkcs.csproj", "{03D84CBD-896D-4B2F-9A22-07034F51E73D}"
ProjectSection(ProjectDependencies) = postProject
{881269F5-9F22-4427-8DC5-63E2C05875BA} = {881269F5-9F22-4427-8DC5-63E2C05875BA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs", "ref\System.Security.Cryptography.Pkcs.csproj", "{881269F5-9F22-4427-8DC5-63E2C05875BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Pkcs", "ref/System.Security.Cryptography.Pkcs.csproj", "{881269F5-9F22-4427-8DC5-63E2C05875BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
index 2de4bce9faf7..b027f6e7683e 100644
--- a/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
+++ b/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives.Tests", "tests\System.Security.Cryptography.Primitives.Tests.csproj", "{101EB757-55A4-4F48-841C-C088640B8F57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives.Tests", "tests/System.Security.Cryptography.Primitives.Tests.csproj", "{101EB757-55A4-4F48-841C-C088640B8F57}"
ProjectSection(ProjectDependencies) = postProject
{DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives", "src\System.Security.Cryptography.Primitives.csproj", "{DF73E985-E143-4BF5-9FA4-E199E7D36235}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives", "src/System.Security.Cryptography.Primitives.csproj", "{DF73E985-E143-4BF5-9FA4-E199E7D36235}"
ProjectSection(ProjectDependencies) = postProject
{F050C895-297F-41C6-98C3-406D791AD515} = {F050C895-297F-41C6-98C3-406D791AD515}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives", "ref\System.Security.Cryptography.Primitives.csproj", "{F050C895-297F-41C6-98C3-406D791AD515}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Primitives", "ref/System.Security.Cryptography.Primitives.csproj", "{F050C895-297F-41C6-98C3-406D791AD515}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln b/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
index 09e45b6dbb4e..0890df0604fc 100644
--- a/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
+++ b/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData.Tests", "tests\System.Security.Cryptography.ProtectedData.Tests.csproj", "{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData.Tests", "tests/System.Security.Cryptography.ProtectedData.Tests.csproj", "{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}"
ProjectSection(ProjectDependencies) = postProject
{FB39F994-1504-4B96-9588-E0385D3B73F1} = {FB39F994-1504-4B96-9588-E0385D3B73F1}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData", "src\System.Security.Cryptography.ProtectedData.csproj", "{FB39F994-1504-4B96-9588-E0385D3B73F1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData", "src/System.Security.Cryptography.ProtectedData.csproj", "{FB39F994-1504-4B96-9588-E0385D3B73F1}"
ProjectSection(ProjectDependencies) = postProject
{28AA66B1-615B-462F-BD63-DC0A20052998} = {28AA66B1-615B-462F-BD63-DC0A20052998}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData", "ref\System.Security.Cryptography.ProtectedData.csproj", "{28AA66B1-615B-462F-BD63-DC0A20052998}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.ProtectedData", "ref/System.Security.Cryptography.ProtectedData.csproj", "{28AA66B1-615B-462F-BD63-DC0A20052998}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.ProtectedData/src/Configurations.props b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props
index b8ef3fc10775..d2be159867b2 100644
--- a/src/System.Security.Cryptography.ProtectedData/src/Configurations.props
+++ b/src/System.Security.Cryptography.ProtectedData/src/Configurations.props
@@ -3,8 +3,6 @@
netfx-Windows_NT;
- netstandard1.3-Windows_NT;
- netstandard1.3-Unix;
netstandard-Windows_NT;
netstandard-Unix;
diff --git a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
index 2df056a26a12..486bf2c642ef 100644
--- a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
+++ b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
@@ -18,10 +18,6 @@
-
-
-
-
diff --git a/src/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln b/src/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
index b83f76393e4f..ab33e9461c07 100644
--- a/src/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
+++ b/src/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates.Tests", "tests\System.Security.Cryptography.X509Certificates.Tests.csproj", "{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates.Tests", "tests/System.Security.Cryptography.X509Certificates.Tests.csproj", "{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}"
ProjectSection(ProjectDependencies) = postProject
{6F8576C2-6CD0-4DF3-8394-00B002D82E40} = {6F8576C2-6CD0-4DF3-8394-00B002D82E40}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates", "src\System.Security.Cryptography.X509Certificates.csproj", "{6F8576C2-6CD0-4DF3-8394-00B002D82E40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates", "src/System.Security.Cryptography.X509Certificates.csproj", "{6F8576C2-6CD0-4DF3-8394-00B002D82E40}"
ProjectSection(ProjectDependencies) = postProject
{B37248D0-B191-4971-AD50-01CFEDF1E09B} = {B37248D0-B191-4971-AD50-01CFEDF1E09B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates", "ref\System.Security.Cryptography.X509Certificates.csproj", "{B37248D0-B191-4971-AD50-01CFEDF1E09B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.X509Certificates", "ref/System.Security.Cryptography.X509Certificates.csproj", "{B37248D0-B191-4971-AD50-01CFEDF1E09B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln b/src/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
index 174b910c53a5..5da13b24cf3b 100644
--- a/src/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
+++ b/src/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml.Tests", "tests\System.Security.Cryptography.Xml.Tests.csproj", "{4A85232C-E914-4E06-8542-26DAF4B22D60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml.Tests", "tests/System.Security.Cryptography.Xml.Tests.csproj", "{4A85232C-E914-4E06-8542-26DAF4B22D60}"
ProjectSection(ProjectDependencies) = postProject
{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A} = {0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml", "src\System.Security.Cryptography.Xml.csproj", "{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml", "src/System.Security.Cryptography.Xml.csproj", "{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}"
ProjectSection(ProjectDependencies) = postProject
{C7266957-DB20-4250-9C2E-E1FF83EDBD71} = {C7266957-DB20-4250-9C2E-E1FF83EDBD71}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml", "ref\System.Security.Cryptography.Xml.csproj", "{C7266957-DB20-4250-9C2E-E1FF83EDBD71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.Xml", "ref/System.Security.Cryptography.Xml.csproj", "{C7266957-DB20-4250-9C2E-E1FF83EDBD71}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Permissions/System.Security.Permissions.sln b/src/System.Security.Permissions/System.Security.Permissions.sln
index 87b9a500b1f8..ec0f64a4a5c8 100644
--- a/src/System.Security.Permissions/System.Security.Permissions.sln
+++ b/src/System.Security.Permissions/System.Security.Permissions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions.Tests", "tests\System.Security.Permissions.Tests.csproj", "{7517F1E9-EEB4-4676-A054-CE4A44A66B66}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions.Tests", "tests/System.Security.Permissions.Tests.csproj", "{7517F1E9-EEB4-4676-A054-CE4A44A66B66}"
ProjectSection(ProjectDependencies) = postProject
{07390899-C8F6-4E83-A3A9-6867B8CB46A0} = {07390899-C8F6-4E83-A3A9-6867B8CB46A0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions", "src\System.Security.Permissions.csproj", "{07390899-C8F6-4E83-A3A9-6867B8CB46A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions", "src/System.Security.Permissions.csproj", "{07390899-C8F6-4E83-A3A9-6867B8CB46A0}"
ProjectSection(ProjectDependencies) = postProject
{07CAF142-B259-418E-86EF-C4BD8B50253E} = {07CAF142-B259-418E-86EF-C4BD8B50253E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions", "ref\System.Security.Permissions.csproj", "{07CAF142-B259-418E-86EF-C4BD8B50253E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Permissions", "ref/System.Security.Permissions.csproj", "{07CAF142-B259-418E-86EF-C4BD8B50253E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Principal.Windows/System.Security.Principal.Windows.sln b/src/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
index c1d97cbedb36..63d8c9e43932 100644
--- a/src/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
+++ b/src/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows.Tests", "tests\System.Security.Principal.Windows.Tests.csproj", "{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows.Tests", "tests/System.Security.Principal.Windows.Tests.csproj", "{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}"
ProjectSection(ProjectDependencies) = postProject
{F9E9894E-2513-4085-9046-311AD49D8AE6} = {F9E9894E-2513-4085-9046-311AD49D8AE6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows", "src\System.Security.Principal.Windows.csproj", "{F9E9894E-2513-4085-9046-311AD49D8AE6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows", "src/System.Security.Principal.Windows.csproj", "{F9E9894E-2513-4085-9046-311AD49D8AE6}"
ProjectSection(ProjectDependencies) = postProject
{25A02E40-D12C-4184-B599-E4F954D142DB} = {25A02E40-D12C-4184-B599-E4F954D142DB}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows", "ref\System.Security.Principal.Windows.csproj", "{25A02E40-D12C-4184-B599-E4F954D142DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal.Windows", "ref/System.Security.Principal.Windows.csproj", "{25A02E40-D12C-4184-B599-E4F954D142DB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Security.Principal/System.Security.Principal.sln b/src/System.Security.Principal/System.Security.Principal.sln
index c02d1110593f..baef077e8342 100644
--- a/src/System.Security.Principal/System.Security.Principal.sln
+++ b/src/System.Security.Principal/System.Security.Principal.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal", "src\System.Security.Principal.csproj", "{FBE16BC8-AE2D-422C-861E-861814F53AF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal", "src/System.Security.Principal.csproj", "{FBE16BC8-AE2D-422C-861E-861814F53AF7}"
ProjectSection(ProjectDependencies) = postProject
{06ECBECD-4100-474D-8F3C-21A0F66A92A6} = {06ECBECD-4100-474D-8F3C-21A0F66A92A6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal", "ref\System.Security.Principal.csproj", "{06ECBECD-4100-474D-8F3C-21A0F66A92A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Principal", "ref/System.Security.Principal.csproj", "{06ECBECD-4100-474D-8F3C-21A0F66A92A6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
diff --git a/src/System.Security.SecureString/System.Security.SecureString.sln b/src/System.Security.SecureString/System.Security.SecureString.sln
index 8c622ae7a3f3..6878ce960103 100644
--- a/src/System.Security.SecureString/System.Security.SecureString.sln
+++ b/src/System.Security.SecureString/System.Security.SecureString.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests.csproj", "{69609238-62C7-479D-A8CE-709F41101D3C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString.Tests", "tests/System.Security.SecureString.Tests.csproj", "{69609238-62C7-479D-A8CE-709F41101D3C}"
ProjectSection(ProjectDependencies) = postProject
{A958BBDD-3238-4E58-AB7F-390AB6D88233} = {A958BBDD-3238-4E58-AB7F-390AB6D88233}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString", "src\System.Security.SecureString.csproj", "{A958BBDD-3238-4E58-AB7F-390AB6D88233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString", "src/System.Security.SecureString.csproj", "{A958BBDD-3238-4E58-AB7F-390AB6D88233}"
ProjectSection(ProjectDependencies) = postProject
{899EC05D-7861-447F-9216-67F8547516DD} = {899EC05D-7861-447F-9216-67F8547516DD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString", "ref\System.Security.SecureString.csproj", "{899EC05D-7861-447F-9216-67F8547516DD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString", "ref/System.Security.SecureString.csproj", "{899EC05D-7861-447F-9216-67F8547516DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
index ac2c5a484e8f..e8c27ea4f2b2 100644
--- a/src/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
+++ b/src/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController.Tests", "tests\System.ServiceProcess.ServiceController.Tests\System.ServiceProcess.ServiceController.Tests.csproj", "{F7D9984B-02EB-4573-84EF-00FFFBFB872C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController.Tests", "tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj", "{F7D9984B-02EB-4573-84EF-00FFFBFB872C}"
ProjectSection(ProjectDependencies) = postProject
{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05} = {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController", "src\System.ServiceProcess.ServiceController.csproj", "{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController", "src/System.ServiceProcess.ServiceController.csproj", "{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}"
ProjectSection(ProjectDependencies) = postProject
{8479566D-6FA5-4241-9D66-524BEC4C19BD} = {8479566D-6FA5-4241-9D66-524BEC4C19BD}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController", "ref\System.ServiceProcess.ServiceController.csproj", "{8479566D-6FA5-4241-9D66-524BEC4C19BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceProcess.ServiceController", "ref/System.ServiceProcess.ServiceController.csproj", "{8479566D-6FA5-4241-9D66-524BEC4C19BD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln b/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
index 0f087e91d4e3..0016dd79548f 100644
--- a/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
+++ b/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{835AD07B-7C9A-406F-B16F-59B3B0D017A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages.Tests", "tests/System.Text.Encoding.CodePages.Tests.csproj", "{835AD07B-7C9A-406F-B16F-59B3B0D017A4}"
ProjectSection(ProjectDependencies) = postProject
{16EE6633-F557-5C9E-9EF3-B5334B044F47} = {16EE6633-F557-5C9E-9EF3-B5334B044F47}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "src\System.Text.Encoding.CodePages.csproj", "{16EE6633-F557-5C9E-9EF3-B5334B044F47}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "src/System.Text.Encoding.CodePages.csproj", "{16EE6633-F557-5C9E-9EF3-B5334B044F47}"
ProjectSection(ProjectDependencies) = postProject
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25} = {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "ref\System.Text.Encoding.CodePages.csproj", "{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "ref/System.Text.Encoding.CodePages.csproj", "{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln b/src/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
index 9692faee57c1..0e22586f3ad9 100644
--- a/src/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
+++ b/src/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions.Tests", "tests\System.Text.Encoding.Extensions.Tests.csproj", "{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions.Tests", "tests/System.Text.Encoding.Extensions.Tests.csproj", "{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}"
ProjectSection(ProjectDependencies) = postProject
{72BFA60D-4F91-4F84-AC6A-910B587DA1BF} = {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions", "src\System.Text.Encoding.Extensions.csproj", "{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions", "src/System.Text.Encoding.Extensions.csproj", "{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}"
ProjectSection(ProjectDependencies) = postProject
{45ED5323-5E2F-445F-B305-21B3044C87B6} = {45ED5323-5E2F-445F-B305-21B3044C87B6}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions", "ref\System.Text.Encoding.Extensions.csproj", "{45ED5323-5E2F-445F-B305-21B3044C87B6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions", "ref/System.Text.Encoding.Extensions.csproj", "{45ED5323-5E2F-445F-B305-21B3044C87B6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Text.Encoding.Extensions/src/Configurations.props b/src/System.Text.Encoding.Extensions/src/Configurations.props
index a8910ef718c7..bbb5be814ea2 100644
--- a/src/System.Text.Encoding.Extensions/src/Configurations.props
+++ b/src/System.Text.Encoding.Extensions/src/Configurations.props
@@ -3,7 +3,8 @@
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
index 9ad061507603..41d1f88236cc 100644
--- a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
+++ b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
@@ -7,8 +7,10 @@
{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}
-
-
+
+
+
+
diff --git a/src/System.Text.Encoding/System.Text.Encoding.sln b/src/System.Text.Encoding/System.Text.Encoding.sln
index b14df63c3140..76f7f0123d98 100644
--- a/src/System.Text.Encoding/System.Text.Encoding.sln
+++ b/src/System.Text.Encoding/System.Text.Encoding.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Tests", "tests\System.Text.Encoding.Tests.csproj", "{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Tests", "tests/System.Text.Encoding.Tests.csproj", "{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}"
ProjectSection(ProjectDependencies) = postProject
{635F30B9-5566-4096-B772-68FAA9B00DF4} = {635F30B9-5566-4096-B772-68FAA9B00DF4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Performance.Tests", "tests\Performance\System.Text.Encoding.Performance.Tests.csproj", "{859C92CB-72FB-453C-A363-7CD025E29B1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Performance.Tests", "tests/Performance/System.Text.Encoding.Performance.Tests.csproj", "{859C92CB-72FB-453C-A363-7CD025E29B1D}"
ProjectSection(ProjectDependencies) = postProject
{635F30B9-5566-4096-B772-68FAA9B00DF4} = {635F30B9-5566-4096-B772-68FAA9B00DF4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding", "src\System.Text.Encoding.csproj", "{635F30B9-5566-4096-B772-68FAA9B00DF4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding", "src/System.Text.Encoding.csproj", "{635F30B9-5566-4096-B772-68FAA9B00DF4}"
ProjectSection(ProjectDependencies) = postProject
{D5E689FD-4848-4E06-B6ED-35EA09AF9E20} = {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding", "ref\System.Text.Encoding.csproj", "{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding", "ref/System.Text.Encoding.csproj", "{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -39,10 +39,10 @@ Global
{859C92CB-72FB-453C-A363-7CD025E29B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{859C92CB-72FB-453C-A363-7CD025E29B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{859C92CB-72FB-453C-A363-7CD025E29B1D}.Release|Any CPU.Build.0 = Release|Any CPU
- {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Text.Encoding/src/Configurations.props b/src/System.Text.Encoding/src/Configurations.props
index dcb70afd11c0..4c3df1a7d7d6 100644
--- a/src/System.Text.Encoding/src/Configurations.props
+++ b/src/System.Text.Encoding/src/Configurations.props
@@ -4,7 +4,8 @@
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
index aa3e9b065147..76465ccb2631 100644
--- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj
+++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
@@ -7,8 +7,10 @@
{635F30B9-5566-4096-B772-68FAA9B00DF4}
-
-
+
+
+
+
diff --git a/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln b/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
index 29976429dfa0..2f59bf5440e7 100644
--- a/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
+++ b/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encodings.Web.Tests", "tests\System.Text.Encodings.Web.Tests.csproj", "{2337A55E-7077-4FBE-8132-2CD8DDC18671}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encodings.Web.Tests", "tests/System.Text.Encodings.Web.Tests.csproj", "{2337A55E-7077-4FBE-8132-2CD8DDC18671}"
ProjectSection(ProjectDependencies) = postProject
{B7EDBF00-765A-48E8-B593-CD668288E274} = {B7EDBF00-765A-48E8-B593-CD668288E274}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encodings.Web", "src\System.Text.Encodings.Web.csproj", "{B7EDBF00-765A-48E8-B593-CD668288E274}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encodings.Web", "src/System.Text.Encodings.Web.csproj", "{B7EDBF00-765A-48E8-B593-CD668288E274}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
index 2680b4879ddf..c7bbb295ba3d 100644
--- a/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
+++ b/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions.Tests", "tests\System.Text.RegularExpressions.Tests.csproj", "{94B106C2-D574-4392-80AB-3EE308A078DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions.Tests", "tests/System.Text.RegularExpressions.Tests.csproj", "{94B106C2-D574-4392-80AB-3EE308A078DF}"
ProjectSection(ProjectDependencies) = postProject
{2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions", "src\System.Text.RegularExpressions.csproj", "{2C58640B-5BED-4E83-9554-CD2B9762643F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions", "src/System.Text.RegularExpressions.csproj", "{2C58640B-5BED-4E83-9554-CD2B9762643F}"
ProjectSection(ProjectDependencies) = postProject
{B262B15E-13E6-4C1E-A25E-16D06E222A09} = {B262B15E-13E6-4C1E-A25E-16D06E222A09}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions", "ref\System.Text.RegularExpressions.csproj", "{B262B15E-13E6-4C1E-A25E-16D06E222A09}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions", "ref/System.Text.RegularExpressions.csproj", "{B262B15E-13E6-4C1E-A25E-16D06E222A09}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/System.Threading.AccessControl/System.Threading.AccessControl.sln
index 09df4b92d459..4589e23921dc 100644
--- a/src/System.Threading.AccessControl/System.Threading.AccessControl.sln
+++ b/src/System.Threading.AccessControl/System.Threading.AccessControl.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl.Tests", "tests\System.Threading.AccessControl.Tests.csproj", "{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl.Tests", "tests/System.Threading.AccessControl.Tests.csproj", "{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}"
ProjectSection(ProjectDependencies) = postProject
{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA} = {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl", "src\System.Threading.AccessControl.csproj", "{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl", "src/System.Threading.AccessControl.csproj", "{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}"
ProjectSection(ProjectDependencies) = postProject
{C2B1A23B-16F9-4015-BE3C-DD871A7C108D} = {C2B1A23B-16F9-4015-BE3C-DD871A7C108D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl", "ref\System.Threading.AccessControl.csproj", "{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.AccessControl", "ref/System.Threading.AccessControl.csproj", "{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/System.Threading.Overlapped/System.Threading.Overlapped.sln
index 5924354e467e..f2451738dd43 100644
--- a/src/System.Threading.Overlapped/System.Threading.Overlapped.sln
+++ b/src/System.Threading.Overlapped/System.Threading.Overlapped.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped.Tests", "tests\System.Threading.Overlapped.Tests.csproj", "{861A3318-35AD-46ac-8257-8D5D2479BAD9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped.Tests", "tests/System.Threading.Overlapped.Tests.csproj", "{861A3318-35AD-46ac-8257-8D5D2479BAD9}"
ProjectSection(ProjectDependencies) = postProject
{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5} = {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped", "src\System.Threading.Overlapped.csproj", "{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped", "src/System.Threading.Overlapped.csproj", "{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}"
ProjectSection(ProjectDependencies) = postProject
{F71467DF-30C1-44A0-A15A-163CB5DB4E6E} = {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped", "ref\System.Threading.Overlapped.csproj", "{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Overlapped", "ref/System.Threading.Overlapped.csproj", "{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
index a374ad125ddd..094aa9e789d2 100644
--- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
+++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
@@ -7,7 +7,7 @@
true
true
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
@@ -34,6 +34,10 @@
+
+
+
+
diff --git a/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln b/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
index 0fe362572ef1..8014bf48ed45 100644
--- a/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
+++ b/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Dataflow.Tests", "tests\System.Threading.Tasks.Dataflow.Tests.csproj", "{72E21903-0FBA-444E-9855-3B4F05DFC1F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Dataflow.Tests", "tests/System.Threading.Tasks.Dataflow.Tests.csproj", "{72E21903-0FBA-444E-9855-3B4F05DFC1F9}"
ProjectSection(ProjectDependencies) = postProject
{2E2F7224-7C72-4A81-9625-A5241F8D836D} = {2E2F7224-7C72-4A81-9625-A5241F8D836D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Dataflow", "src\System.Threading.Tasks.Dataflow.csproj", "{2E2F7224-7C72-4A81-9625-A5241F8D836D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Dataflow", "src/System.Threading.Tasks.Dataflow.csproj", "{2E2F7224-7C72-4A81-9625-A5241F8D836D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
index b9dc8eaedf44..8882d7ff9e02 100644
--- a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
+++ b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
@@ -62,18 +62,21 @@
+
+
+
+
-
-
+
diff --git a/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
index ce20373cad94..47d51018a823 100644
--- a/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
+++ b/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions.Tests", "tests\System.Threading.Tasks.Extensions.Tests.csproj", "{275B161B-D525-48A0-B1DE-344273AB9A99}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions.Tests", "tests/System.Threading.Tasks.Extensions.Tests.csproj", "{275B161B-D525-48A0-B1DE-344273AB9A99}"
ProjectSection(ProjectDependencies) = postProject
{DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions", "src\System.Threading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Extensions", "src/System.Threading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln b/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
index 8b7c0f420df7..be1525655309 100644
--- a/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
+++ b/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel.Tests", "tests\System.Threading.Tasks.Parallel.Tests.csproj", "{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel.Tests", "tests/System.Threading.Tasks.Parallel.Tests.csproj", "{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}"
ProjectSection(ProjectDependencies) = postProject
{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F} = {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel", "src\System.Threading.Tasks.Parallel.csproj", "{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel", "src/System.Threading.Tasks.Parallel.csproj", "{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}"
ProjectSection(ProjectDependencies) = postProject
{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B} = {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel", "ref\System.Threading.Tasks.Parallel.csproj", "{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel", "ref/System.Threading.Tasks.Parallel.csproj", "{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Tasks/System.Threading.Tasks.sln b/src/System.Threading.Tasks/System.Threading.Tasks.sln
index 7704d9097b52..ee5b8405fcc4 100644
--- a/src/System.Threading.Tasks/System.Threading.Tasks.sln
+++ b/src/System.Threading.Tasks/System.Threading.Tasks.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests.csproj", "{B6C09633-D161-499A-8FE1-46B2D53A16E7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Tests", "tests/System.Threading.Tasks.Tests.csproj", "{B6C09633-D161-499A-8FE1-46B2D53A16E7}"
ProjectSection(ProjectDependencies) = postProject
{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA} = {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks", "src\System.Threading.Tasks.csproj", "{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks", "src/System.Threading.Tasks.csproj", "{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}"
ProjectSection(ProjectDependencies) = postProject
{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C} = {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks", "ref\System.Threading.Tasks.csproj", "{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks", "ref/System.Threading.Tasks.csproj", "{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.Tasks/src/Configurations.props b/src/System.Threading.Tasks/src/Configurations.props
index 67525a620115..bf2603e34d53 100644
--- a/src/System.Threading.Tasks/src/Configurations.props
+++ b/src/System.Threading.Tasks/src/Configurations.props
@@ -1,12 +1,12 @@
+
uapaot-Windows_NT;
uap-Windows_NT;
netcoreapp-Windows_NT;
netcoreapp-Unix;
- netcoreapp1.2corert;
\ No newline at end of file
diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
index d83a0bdea94f..aedcd0fa5f09 100644
--- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
+++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
@@ -11,8 +11,6 @@
-
-
diff --git a/src/System.Threading.Thread/System.Threading.Thread.sln b/src/System.Threading.Thread/System.Threading.Thread.sln
index c69c4d62bb56..d1a42df584bc 100644
--- a/src/System.Threading.Thread/System.Threading.Thread.sln
+++ b/src/System.Threading.Thread/System.Threading.Thread.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread.Tests", "tests\System.Threading.Thread.Tests.csproj", "{33F5A50E-B823-4FDD-8571-365C909ACEAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread.Tests", "tests/System.Threading.Thread.Tests.csproj", "{33F5A50E-B823-4FDD-8571-365C909ACEAE}"
ProjectSection(ProjectDependencies) = postProject
{06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread", "src\System.Threading.Thread.csproj", "{06197EED-FF48-43F3-976D-463839D43E8C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread", "src/System.Threading.Thread.csproj", "{06197EED-FF48-43F3-976D-463839D43E8C}"
ProjectSection(ProjectDependencies) = postProject
{82D06A2D-008D-4A4A-A83D-FB7F04721C87} = {82D06A2D-008D-4A4A-A83D-FB7F04721C87}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread", "ref\System.Threading.Thread.csproj", "{82D06A2D-008D-4A4A-A83D-FB7F04721C87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Thread", "ref/System.Threading.Thread.csproj", "{82D06A2D-008D-4A4A-A83D-FB7F04721C87}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
index 627d68c44162..19cfe1ef89bc 100644
--- a/src/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
+++ b/src/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool.Tests", "tests\System.Threading.ThreadPool.Tests.csproj", "{403AD1B8-6F95-4A2E-92A2-727606ABD866}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool.Tests", "tests/System.Threading.ThreadPool.Tests.csproj", "{403AD1B8-6F95-4A2E-92A2-727606ABD866}"
ProjectSection(ProjectDependencies) = postProject
{EE797598-BA64-4150-A3AA-8FB97DA63697} = {EE797598-BA64-4150-A3AA-8FB97DA63697}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool", "src\System.Threading.ThreadPool.csproj", "{EE797598-BA64-4150-A3AA-8FB97DA63697}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool", "src/System.Threading.ThreadPool.csproj", "{EE797598-BA64-4150-A3AA-8FB97DA63697}"
ProjectSection(ProjectDependencies) = postProject
{3A5A0D64-7796-4BC2-8288-4B04B97C4A70} = {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool", "ref\System.Threading.ThreadPool.csproj", "{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.ThreadPool", "ref/System.Threading.ThreadPool.csproj", "{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Threading.ThreadPool/src/Configurations.props b/src/System.Threading.ThreadPool/src/Configurations.props
index 2845c11c541d..1040c9ba37f0 100644
--- a/src/System.Threading.ThreadPool/src/Configurations.props
+++ b/src/System.Threading.ThreadPool/src/Configurations.props
@@ -2,7 +2,8 @@
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
index e7ee10f31d14..a235023643b6 100644
--- a/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
+++ b/src/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
@@ -7,8 +7,10 @@
{EE797598-BA64-4150-A3AA-8FB97DA63697}
-
-
+
+
+
+
diff --git a/src/System.Threading.Timer/System.Threading.Timer.sln b/src/System.Threading.Timer/System.Threading.Timer.sln
index 2d04879faf6f..300f6a091cb8 100644
--- a/src/System.Threading.Timer/System.Threading.Timer.sln
+++ b/src/System.Threading.Timer/System.Threading.Timer.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer.Tests", "tests\System.Threading.Timer.Tests.csproj", "{ac20a28f-fda8-45e8-8728-058ead16e44c}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer.Tests", "tests/System.Threading.Timer.Tests.csproj", "{ac20a28f-fda8-45e8-8728-058ead16e44c}"
ProjectSection(ProjectDependencies) = postProject
{0F8B87B4-0E61-4DC6-9E90-CD4863025272} = {0F8B87B4-0E61-4DC6-9E90-CD4863025272}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer", "src\System.Threading.Timer.csproj", "{0F8B87B4-0E61-4DC6-9E90-CD4863025272}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer", "src/System.Threading.Timer.csproj", "{0F8B87B4-0E61-4DC6-9E90-CD4863025272}"
ProjectSection(ProjectDependencies) = postProject
{DC78B562-4F74-49C2-9766-3B65CD610CCC} = {DC78B562-4F74-49C2-9766-3B65CD610CCC}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer", "ref\System.Threading.Timer.csproj", "{DC78B562-4F74-49C2-9766-3B65CD610CCC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Timer", "ref/System.Threading.Timer.csproj", "{DC78B562-4F74-49C2-9766-3B65CD610CCC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
@@ -30,10 +30,10 @@ Global
{ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
- {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
- {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
- {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
- {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+ {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+ {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+ {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+ {0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
diff --git a/src/System.Threading.Timer/src/Configurations.props b/src/System.Threading.Timer/src/Configurations.props
index 475368bbbb71..aed58fb42e46 100644
--- a/src/System.Threading.Timer/src/Configurations.props
+++ b/src/System.Threading.Timer/src/Configurations.props
@@ -4,7 +4,8 @@
uap-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
\ No newline at end of file
diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
index a5d528e25fa2..adea7bb6cbbb 100644
--- a/src/System.Threading.Timer/src/System.Threading.Timer.csproj
+++ b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
@@ -7,8 +7,10 @@
{0F8B87B4-0E61-4DC6-9E90-CD4863025272}
-
-
+
+
+
+
diff --git a/src/System.Threading/System.Threading.sln b/src/System.Threading/System.Threading.sln
index 474d8f8bce47..fd94a1353abd 100644
--- a/src/System.Threading/System.Threading.sln
+++ b/src/System.Threading/System.Threading.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tests", "tests\System.Threading.Tests.csproj", "{18EF66B3-51EE-46D8-B283-1CB6A1197813}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tests", "tests/System.Threading.Tests.csproj", "{18EF66B3-51EE-46D8-B283-1CB6A1197813}"
ProjectSection(ProjectDependencies) = postProject
{604027F5-1DFC-42F4-B4FE-61F8789BA647} = {604027F5-1DFC-42F4-B4FE-61F8789BA647}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Performance.Tests", "tests\Performance\System.Threading.Performance.Tests.csproj", "{7AB03FFA-7D4D-4248-9702-3D2785859C18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Performance.Tests", "tests/Performance/System.Threading.Performance.Tests.csproj", "{7AB03FFA-7D4D-4248-9702-3D2785859C18}"
ProjectSection(ProjectDependencies) = postProject
{604027F5-1DFC-42F4-B4FE-61F8789BA647} = {604027F5-1DFC-42F4-B4FE-61F8789BA647}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading", "src\System.Threading.csproj", "{604027F5-1DFC-42F4-B4FE-61F8789BA647}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading", "src/System.Threading.csproj", "{604027F5-1DFC-42F4-B4FE-61F8789BA647}"
ProjectSection(ProjectDependencies) = postProject
{F59F13CA-829A-4D02-9A1D-E40E61257177} = {F59F13CA-829A-4D02-9A1D-E40E61257177}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading", "ref\System.Threading.csproj", "{F59F13CA-829A-4D02-9A1D-E40E61257177}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading", "ref/System.Threading.csproj", "{F59F13CA-829A-4D02-9A1D-E40E61257177}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj
index e124ecdb7b0c..4a2510c1e74f 100644
--- a/src/System.Threading/src/System.Threading.csproj
+++ b/src/System.Threading/src/System.Threading.csproj
@@ -6,7 +6,7 @@
System.Threading
true
true
- $(GenFacadesArgs) -ignoreMissingTypes
+ true
diff --git a/src/System.Transactions/System.Transactions.sln b/src/System.Transactions/System.Transactions.sln
index 3cbd1d22b0dc..17d47b479699 100644
--- a/src/System.Transactions/System.Transactions.sln
+++ b/src/System.Transactions/System.Transactions.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions.Tests", "tests\System.Transactions.Tests.csproj", "{1C397868-9644-48CB-94BF-35805C4AE024}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions.Tests", "tests/System.Transactions.Tests.csproj", "{1C397868-9644-48CB-94BF-35805C4AE024}"
ProjectSection(ProjectDependencies) = postProject
{E97557E3-7DB1-4828-ACA5-44D8C68B6698} = {E97557E3-7DB1-4828-ACA5-44D8C68B6698}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions", "src\System.Transactions.csproj", "{E97557E3-7DB1-4828-ACA5-44D8C68B6698}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions", "src/System.Transactions.csproj", "{E97557E3-7DB1-4828-ACA5-44D8C68B6698}"
ProjectSection(ProjectDependencies) = postProject
{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4} = {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions", "ref\System.Transactions.csproj", "{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions", "ref/System.Transactions.csproj", "{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.ValueTuple/System.ValueTuple.sln b/src/System.ValueTuple/System.ValueTuple.sln
index a42a52b15e20..d6da062e3f58 100644
--- a/src/System.ValueTuple/System.ValueTuple.sln
+++ b/src/System.ValueTuple/System.ValueTuple.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple.Tests", "tests\System.ValueTuple.Tests.csproj", "{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple.Tests", "tests/System.ValueTuple.Tests.csproj", "{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}"
ProjectSection(ProjectDependencies) = postProject
{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29} = {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple", "src\System.ValueTuple.csproj", "{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple", "src/System.ValueTuple.csproj", "{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}"
ProjectSection(ProjectDependencies) = postProject
{11AE73F7-3532-47B9-8FF6-B4F22D76456D} = {11AE73F7-3532-47B9-8FF6-B4F22D76456D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple", "ref\System.ValueTuple.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ValueTuple", "ref/System.ValueTuple.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/System.Web.HttpUtility/System.Web.HttpUtility.sln
index a40b6ce08c0d..12706147e4cb 100644
--- a/src/System.Web.HttpUtility/System.Web.HttpUtility.sln
+++ b/src/System.Web.HttpUtility/System.Web.HttpUtility.sln
@@ -2,17 +2,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility.Tests", "tests\System.Web.HttpUtility.Tests.csproj", "{914279EE-58B1-4B27-BA18-66D988C8DFFA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility.Tests", "tests/System.Web.HttpUtility.Tests.csproj", "{914279EE-58B1-4B27-BA18-66D988C8DFFA}"
ProjectSection(ProjectDependencies) = postProject
{CE959FC9-5E04-4F29-96B5-454BF3E76306} = {CE959FC9-5E04-4F29-96B5-454BF3E76306}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility", "src\System.Web.HttpUtility.csproj", "{CE959FC9-5E04-4F29-96B5-454BF3E76306}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility", "src/System.Web.HttpUtility.csproj", "{CE959FC9-5E04-4F29-96B5-454BF3E76306}"
ProjectSection(ProjectDependencies) = postProject
{CB57F978-2BA8-4BF3-A755-A032030974A0} = {CB57F978-2BA8-4BF3-A755-A032030974A0}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility", "ref\System.Web.HttpUtility.csproj", "{CB57F978-2BA8-4BF3-A755-A032030974A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.HttpUtility", "ref/System.Web.HttpUtility.csproj", "{CB57F978-2BA8-4BF3-A755-A032030974A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
index ca7a18fa53f0..5e662e41c3eb 100644
--- a/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
+++ b/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.ReaderWriter", "src\System.Xml.ReaderWriter.csproj", "{C559743A-762E-4D9D-B986-E77BDB97652E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.ReaderWriter", "src/System.Xml.ReaderWriter.csproj", "{C559743A-762E-4D9D-B986-E77BDB97652E}"
ProjectSection(ProjectDependencies) = postProject
{6F785D18-A969-4DB9-AB45-DD294839087D} = {6F785D18-A969-4DB9-AB45-DD294839087D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.ReaderWriter", "ref\System.Xml.ReaderWriter.csproj", "{6F785D18-A969-4DB9-AB45-DD294839087D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.ReaderWriter", "ref/System.Xml.ReaderWriter.csproj", "{6F785D18-A969-4DB9-AB45-DD294839087D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XDocument/System.Xml.XDocument.sln b/src/System.Xml.XDocument/System.Xml.XDocument.sln
index 5ac5148f50a6..38915c4d586c 100644
--- a/src/System.Xml.XDocument/System.Xml.XDocument.sln
+++ b/src/System.Xml.XDocument/System.Xml.XDocument.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "src\System.Xml.XDocument.csproj", "{442C5A88-29C2-4B00-B1DF-730D646D3861}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "src/System.Xml.XDocument.csproj", "{442C5A88-29C2-4B00-B1DF-730D646D3861}"
ProjectSection(ProjectDependencies) = postProject
{506A8ECB-E5B4-4F10-8419-26A0EC7AB225} = {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "ref\System.Xml.XDocument.csproj", "{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "ref/System.Xml.XDocument.csproj", "{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln b/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
index b264d627a421..0cef22e02f22 100644
--- a/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
+++ b/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "src\System.Xml.XPath.XDocument.csproj", "{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "src/System.Xml.XPath.XDocument.csproj", "{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}"
ProjectSection(ProjectDependencies) = postProject
{F44BEAB4-EDDB-497B-B15C-11E8DFB94092} = {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "ref\System.Xml.XPath.XDocument.csproj", "{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument", "ref/System.Xml.XPath.XDocument.csproj", "{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln b/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln
index a6aae0365b52..050242359012 100644
--- a/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln
+++ b/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument", "src\System.Xml.XPath.XmlDocument.csproj", "{17CB2E3C-2904-4241-94DB-3894D24F35DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument", "src/System.Xml.XPath.XmlDocument.csproj", "{17CB2E3C-2904-4241-94DB-3894D24F35DA}"
ProjectSection(ProjectDependencies) = postProject
{1E9C3A08-4B4A-4991-9857-DA93BE791C83} = {1E9C3A08-4B4A-4991-9857-DA93BE791C83}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument", "ref\System.Xml.XPath.XmlDocument.csproj", "{1E9C3A08-4B4A-4991-9857-DA93BE791C83}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument", "ref/System.Xml.XPath.XmlDocument.csproj", "{1E9C3A08-4B4A-4991-9857-DA93BE791C83}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XPath/System.Xml.XPath.sln b/src/System.Xml.XPath/System.Xml.XPath.sln
index c7eca6a2a319..3fc1887e6840 100644
--- a/src/System.Xml.XPath/System.Xml.XPath.sln
+++ b/src/System.Xml.XPath/System.Xml.XPath.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "src\System.Xml.XPath.csproj", "{783F801D-50DE-45B1-B8BE-C36A1F5049F1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "src/System.Xml.XPath.csproj", "{783F801D-50DE-45B1-B8BE-C36A1F5049F1}"
ProjectSection(ProjectDependencies) = postProject
{A3B3FF23-D123-4F5A-8618-5128B18987C5} = {A3B3FF23-D123-4F5A-8618-5128B18987C5}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "ref\System.Xml.XPath.csproj", "{A3B3FF23-D123-4F5A-8618-5128B18987C5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "ref/System.Xml.XPath.csproj", "{A3B3FF23-D123-4F5A-8618-5128B18987C5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
index 81919d530386..183b900cc0c8 100644
--- a/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
+++ b/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument", "src\System.Xml.XmlDocument.csproj", "{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument", "src/System.Xml.XmlDocument.csproj", "{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}"
ProjectSection(ProjectDependencies) = postProject
{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E} = {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument", "ref\System.Xml.XmlDocument.csproj", "{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument", "ref/System.Xml.XmlDocument.csproj", "{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
index ec5d5a24a708..23cf573aa359 100644
--- a/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
+++ b/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer", "src\System.Xml.XmlSerializer.csproj", "{D62A6082-5229-4845-8BE9-75753E08C65A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer", "src/System.Xml.XmlSerializer.csproj", "{D62A6082-5229-4845-8BE9-75753E08C65A}"
ProjectSection(ProjectDependencies) = postProject
{3F7C5D50-7CDA-44EF-BB05-912D496BAA46} = {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer", "ref\System.Xml.XmlSerializer.csproj", "{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer", "ref/System.Xml.XmlSerializer.csproj", "{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
diff --git a/src/Tools/GenerateProps/targetgroups.props b/src/Tools/GenerateProps/targetgroups.props
index ea4133e92f02..9a06eea7155b 100644
--- a/src/Tools/GenerateProps/targetgroups.props
+++ b/src/Tools/GenerateProps/targetgroups.props
@@ -133,9 +133,11 @@
Windows,Version=v8.0
+ netstandard1.1
WindowsPhoneApp,Version=v8.1
+ netstandard1.2
.NETPortable,Version=v0.0,Profile=Profile47
diff --git a/src/shims/shims.proj b/src/shims/shims.proj
index 121367d3e075..626eb1847ac4 100644
--- a/src/shims/shims.proj
+++ b/src/shims/shims.proj
@@ -14,10 +14,23 @@
$(RefPath)
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -51,16 +64,16 @@
$(ToolHostCmd) "$(ToolsDir)GenFacades.exe"
-
+
-
+
-
+