diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2017-02-03 04:54:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 04:54:40 +0300 |
| commit | e79912f8b77bc22abfd85e94b74c06e5d99e8381 (patch) | |
| tree | 391ecc074646284dde8da4f600f31bfe9ec03da7 /src | |
| parent | d0001fe7c89b7e1b5d629ba0f13f1233ea72490d (diff) | |
Enable compiling the test projects against the configuration (#15743)
* Enable compiling the test projects against the configuration
The tests were compiled using the vertical configuration and not the best configuration picked from Configurations.props. this change is fix that and have all test projects configured accordingly.
This change ensuring netcoreapp runs successfully and we'll have another rounds later for other configurations like netfx, UAP...etc.
* Fix openssl test project on Linux distros
* Update the project configurations
* Update VS solution files
* update solution files
Diffstat (limited to 'src')
246 files changed, 960 insertions, 639 deletions
diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj index c10eaffc8b..3676ef7939 100644 --- a/src/Common/tests/Common.Tests.csproj +++ b/src/Common/tests/Common.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,10 +7,14 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> @@ -140,4 +144,4 @@ <Folder Include="System\Net\VirtualNetwork\" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/Common/tests/Configurations.props b/src/Common/tests/Configurations.props index 0c2d77f6b7..4b99dafea6 100644 --- a/src/Common/tests/Configurations.props +++ b/src/Common/tests/Configurations.props @@ -1,9 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project> diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/Configurations.props b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/Configurations.props +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj index 516aa4e12a..05c88dc373 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj @@ -11,6 +11,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/Common/tests/System/Xml/ModuleCore/Configurations.props b/src/Common/tests/System/Xml/ModuleCore/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/Common/tests/System/Xml/ModuleCore/Configurations.props +++ b/src/Common/tests/System/Xml/ModuleCore/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index 50f2500e59..c754470c04 100644 --- a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -5,6 +5,8 @@ <ProjectGuid>{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}</ProjectGuid> <NoWarn>0436</NoWarn> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/Common/tests/System/Xml/XmlCoreTest/Configurations.props b/src/Common/tests/System/Xml/XmlCoreTest/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/Configurations.props +++ b/src/Common/tests/System/Xml/XmlCoreTest/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj b/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj index 3119711686..d5384db7d0 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj +++ b/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj @@ -7,6 +7,8 @@ <RootNamespace>XmlCoreTest.Common</RootNamespace> <NoWarn>0436</NoWarn> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/Common/tests/System/Xml/XmlDiff/Configurations.props b/src/Common/tests/System/Xml/XmlDiff/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/Common/tests/System/Xml/XmlDiff/Configurations.props +++ b/src/Common/tests/System/Xml/XmlDiff/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj index a074934c6b..7cb18ce0f5 100644 --- a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj +++ b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj @@ -7,6 +7,8 @@ <RootNamespace>System.Xml.XmlDiff</RootNamespace> <NoWarn>0436</NoWarn> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln b/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln index 1090f6c2e8..e380ad26b1 100644 --- a/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln +++ b/src/Microsoft.VisualBasic/Microsoft.VisualBasic.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {FE25D593-8029-4726-ABC2-944522B5BE04}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {FE25D593-8029-4726-ABC2-944522B5BE04}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {FE25D593-8029-4726-ABC2-944522B5BE04}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/Microsoft.VisualBasic/tests/Configurations.props b/src/Microsoft.VisualBasic/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/Microsoft.VisualBasic/tests/Configurations.props +++ b/src/Microsoft.VisualBasic/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj index 6b3be1295f..10040bbbef 100644 --- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj +++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="StringsTests.cs" /> </ItemGroup> 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 0ecb30d7d3..8a32812008 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln +++ b/src/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props b/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props index 5f482b878b..a46649cccc 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT;; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj index aac5536a29..1c47b5a16d 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{C2B7761E-A4C0-4285-8B83-CC426A1494FA}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="RegistryAclExtensionsTests.cs" /> </ItemGroup> diff --git a/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln index f3d7f2c34a..53f605c25b 100644 --- a/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln +++ b/src/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/Microsoft.Win32.Registry/tests/Configurations.props b/src/Microsoft.Win32.Registry/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/Microsoft.Win32.Registry/tests/Configurations.props +++ b/src/Microsoft.Win32.Registry/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index efcc043d25..f079528115 100644 --- a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{20A2BA2C-5517-483F-8FFE-643441A59852}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> @@ -54,4 +56,4 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.AppContext/System.AppContext.sln b/src/System.AppContext/System.AppContext.sln index 2db1fda77d..3add3a8d24 100644 --- a/src/System.AppContext/System.AppContext.sln +++ b/src/System.AppContext/System.AppContext.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {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 diff --git a/src/System.AppContext/tests/Configurations.props b/src/System.AppContext/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.AppContext/tests/Configurations.props +++ b/src/System.AppContext/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.AppContext/tests/System.AppContext.Tests.csproj b/src/System.AppContext/tests/System.AppContext.Tests.csproj index da14c290b2..20c8bd5d66 100644 --- a/src/System.AppContext/tests/System.AppContext.Tests.csproj +++ b/src/System.AppContext/tests/System.AppContext.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{6F04B167-A03F-4206-8481-60213C3EF9B9}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AppContext.Switch.cs" /> <Compile Include="AppContext.Switch.Validation.cs" /> diff --git a/src/System.Buffers/System.Buffers.sln b/src/System.Buffers/System.Buffers.sln index 2f7c57b903..cd908cdbd0 100644 --- a/src/System.Buffers/System.Buffers.sln +++ b/src/System.Buffers/System.Buffers.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {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 diff --git a/src/System.Buffers/tests/Configurations.props b/src/System.Buffers/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Buffers/tests/Configurations.props +++ b/src/System.Buffers/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Buffers/tests/System.Buffers.Tests.csproj b/src/System.Buffers/tests/System.Buffers.Tests.csproj index 3ede5baa11..be9b871418 100644 --- a/src/System.Buffers/tests/System.Buffers.Tests.csproj +++ b/src/System.Buffers/tests/System.Buffers.Tests.csproj @@ -4,6 +4,8 @@ <PropertyGroup> <ProjectGuid>{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}</ProjectGuid> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Collections.Immutable/System.Collections.Immutable.sln b/src/System.Collections.Immutable/System.Collections.Immutable.sln index af2d6ff3cd..f37506c63c 100644 --- a/src/System.Collections.Immutable/System.Collections.Immutable.sln +++ b/src/System.Collections.Immutable/System.Collections.Immutable.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Collections.Immutable/tests/Configurations.props b/src/System.Collections.Immutable/tests/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Collections.Immutable/tests/Configurations.props +++ b/src/System.Collections.Immutable/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index 233739c898..745af13df7 100644 --- a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,8 +6,12 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="BadHasher.cs" /> <Compile Include="EverythingEqual.cs" /> @@ -107,4 +111,4 @@ </ItemGroup> <ItemGroup /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln index bb57777e98..64d04d9cae 100644 --- a/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln +++ b/src/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props +++ b/src/System.ComponentModel.EventBasedAsync/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj index 6a58fa2888..ef55372fd3 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj +++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -8,8 +8,10 @@ <ProjectGuid>{59E9B218-81D0-4A80-A4B7-66C716136D82}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AsyncOperationManagerTests.cs" /> <Compile Include="RunWorkerCompletedEventArgsTests.cs" /> @@ -21,4 +23,4 @@ <Compile Include="TestException.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln index 778bfa5d54..823bb8a6ee 100644 --- a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln +++ b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {89C76728-ECAF-4905-A33F-BD6BFED5E91D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89C76728-ECAF-4905-A33F-BD6BFED5E91D}.Debug|Any CPU.Build.0 = Debug|Any CPU {89C76728-ECAF-4905-A33F-BD6BFED5E91D}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/System.ComponentModel.TypeConverter/tests/Configurations.props b/src/System.ComponentModel.TypeConverter/tests/Configurations.props index 800e963c80..c43af8d511 100644 --- a/src/System.ComponentModel.TypeConverter/tests/Configurations.props +++ b/src/System.ComponentModel.TypeConverter/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.5; netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index 3538dd82fb..0f2fef80dd 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,10 +7,12 @@ <DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="ArrayConverterTests.cs" /> <Compile Include="AttributeCollectionTests.cs" /> @@ -77,4 +79,4 @@ <Compile Include="Security\Authentication\ExtendedProtection\ExtendedProtectionPolicyTypeConverterTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/System.ComponentModel.sln b/src/System.ComponentModel/System.ComponentModel.sln index d5fad6761a..2d9e5ccdcc 100644 --- a/src/System.ComponentModel/System.ComponentModel.sln +++ b/src/System.ComponentModel/System.ComponentModel.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.ComponentModel/tests/Configurations.props b/src/System.ComponentModel/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.ComponentModel/tests/Configurations.props +++ b/src/System.ComponentModel/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj index 6582ebde55..93207ee43d 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{40C01084-DAB1-4F24-8729-85523BC9F04E}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="ComponentModelBasicTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/System.Composition.Convention.sln b/src/System.Composition.Convention/System.Composition.Convention.sln index e979717047..a0ae890b10 100644 --- a/src/System.Composition.Convention/System.Composition.Convention.sln +++ b/src/System.Composition.Convention/System.Composition.Convention.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.ActiveCfg = netcoreapp1.0-Debug|Any CPU - {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.Build.0 = netcoreapp1.0-Debug|Any CPU - {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.ActiveCfg = netcoreapp1.0-Release|Any CPU - {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.Build.0 = netcoreapp1.0-Release|Any CPU + {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {E6592FAD-10B5-4B56-9287-D72DD136992F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Composition.Convention/tests/Configurations.props b/src/System.Composition.Convention/tests/Configurations.props index fa32899de2..2845c11c54 100644 --- a/src/System.Composition.Convention/tests/Configurations.props +++ b/src/System.Composition.Convention/tests/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp1.0; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj index e02359345a..c71c4ad55a 100644 --- a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj +++ b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,8 +6,8 @@ <RootNamespace>ConventionsUnitTests</RootNamespace> <AssemblyName>System.Composition.Convention.Tests</AssemblyName> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> <ItemGroup> <Compile Include="..\..\System.Composition\tests\Util\AssertX.cs"> <Link>Util\AssertX.cs</Link> @@ -26,4 +26,4 @@ <Compile Include="PartBuilderTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Composition/System.Composition.sln b/src/System.Composition/System.Composition.sln index 0758cbcf7f..4b552e0af4 100644 --- a/src/System.Composition/System.Composition.sln +++ b/src/System.Composition/System.Composition.sln @@ -12,10 +12,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Configurations.props b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Configurations.props +++ b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj index 402023a4eb..e25ebe862b 100644 --- a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj +++ b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj @@ -8,6 +8,8 @@ <ProjectGuid>{44C7E52C-3873-4C64-875C-8A23A8376D60}</ProjectGuid> <NoWarn>0436</NoWarn> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Composition/scenarios/TestLibrary/Configurations.props b/src/System.Composition/scenarios/TestLibrary/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Composition/scenarios/TestLibrary/Configurations.props +++ b/src/System.Composition/scenarios/TestLibrary/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj b/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj index 4a6966e09d..611d4f165a 100644 --- a/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj +++ b/src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj @@ -8,6 +8,10 @@ <ProjectGuid>{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}</ProjectGuid> <NoWarn>0436,3021</NoWarn> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Composition/tests/Configurations.props b/src/System.Composition/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Composition/tests/Configurations.props +++ b/src/System.Composition/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Composition/tests/System.Composition.Tests.csproj b/src/System.Composition/tests/System.Composition.Tests.csproj index ae42b3e6f2..aab61bd5b4 100644 --- a/src/System.Composition/tests/System.Composition.Tests.csproj +++ b/src/System.Composition/tests/System.Composition.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,8 +6,10 @@ <RootNamespace>System.Composition.Lightweight.UnitTests</RootNamespace> <AssemblyName>System.Composition.Tests</AssemblyName> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="ActivationEventOrderingTests.cs" /> <Compile Include="CardinalityTests.cs" /> @@ -53,4 +55,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Console/System.Console.sln b/src/System.Console/System.Console.sln index fd09c5ff31..e6ebc4f834 100644 --- a/src/System.Console/System.Console.sln +++ b/src/System.Console/System.Console.sln @@ -36,10 +36,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {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 diff --git a/src/System.Console/tests/Configurations.props b/src/System.Console/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Console/tests/Configurations.props +++ b/src/System.Console/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Console/tests/System.Console.Tests.csproj b/src/System.Console/tests/System.Console.Tests.csproj index 910e886a63..38cf0c88fd 100644 --- a/src/System.Console/tests/System.Console.Tests.csproj +++ b/src/System.Console/tests/System.Console.Tests.csproj @@ -6,8 +6,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>Common\tests\System\PlatformDetection.cs</Link> diff --git a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln index ede051c544..aaa93afe61 100644 --- a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln +++ b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {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 diff --git a/src/System.Diagnostics.Contracts/tests/Configurations.props b/src/System.Diagnostics.Contracts/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Diagnostics.Contracts/tests/Configurations.props +++ b/src/System.Diagnostics.Contracts/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj index fd737f5deb..84eea97170 100644 --- a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj +++ b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj @@ -1,11 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AssertTests.cs" /> <Compile Include="AssumeTests.cs" /> @@ -19,4 +21,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln index 308802919f..4307c7ae90 100644 --- a/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln +++ b/src/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props +++ b/src/System.Diagnostics.DiagnosticSource/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 8cdd52dcd1..ea67ece9f9 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="DiagnosticSourceEventSourceBridgeTests.cs" /> <Compile Include="DiagnosticSourceTests.cs" /> diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln index 355f3b2357..0404b31543 100644 --- a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln +++ b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Drawing.Primitives/tests/Configurations.props b/src/System.Drawing.Primitives/tests/Configurations.props index b2db637110..4c498002c4 100644 --- a/src/System.Drawing.Primitives/tests/Configurations.props +++ b/src/System.Drawing.Primitives/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index f95f1db015..0727f06099 100644 --- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{297A9116-1005-499D-A895-2063D03E4C94}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="PointFTests.cs" /> <Compile Include="PointTests.cs" /> @@ -28,4 +30,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/tests/Configurations.props b/src/System.IO.Compression.ZipFile/tests/Configurations.props index 7bf1970590..b1af5b762e 100644 --- a/src/System.IO.Compression.ZipFile/tests/Configurations.props +++ b/src/System.IO.Compression.ZipFile/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 877812455a..380e50414c 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -4,10 +4,12 @@ <PropertyGroup> <ProjectGuid>{775727A6-DF41-4160-A7FD-180279A653C7}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="ZipFileConvenienceMethods.cs" /> <Compile Include="ZipFileInvalidFileTests.cs" /> 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 9ffb4e4697..0dca71f839 100644 --- a/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln +++ b/src/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.IO.FileSystem.AccessControl/tests/Configurations.props b/src/System.IO.FileSystem.AccessControl/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/Configurations.props +++ b/src/System.IO.FileSystem.AccessControl/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 4034b1376f..f367832302 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -1,13 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="FileSystemAclExtensionsTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 31a9614453..2ecc25e251 100644 --- a/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln +++ b/src/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props index 211cd2bec8..cf10431a14 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props +++ b/src/System.IO.FileSystem.DriveInfo/tests/Configurations.props @@ -3,7 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj index f5b181a9f5..f07420d62b 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj +++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj @@ -1,14 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="DriveInfo.Unix.Tests.cs" /> <Compile Include="DriveInfo.Windows.Tests.cs" /> @@ -17,4 +17,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/System.IO.FileSystem.sln b/src/System.IO.FileSystem/System.IO.FileSystem.sln index e042cc74ef..e2b62ddfb7 100644 --- a/src/System.IO.FileSystem/System.IO.FileSystem.sln +++ b/src/System.IO.FileSystem/System.IO.FileSystem.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {3C42F714-82AF-4A43-9B9C-744DE31B5C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C42F714-82AF-4A43-9B9C-744DE31B5C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C42F714-82AF-4A43-9B9C-744DE31B5C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/System.IO.FileSystem/tests/Configurations.props b/src/System.IO.FileSystem/tests/Configurations.props index fa9e1005a0..c01d1b317f 100644 --- a/src/System.IO.FileSystem/tests/Configurations.props +++ b/src/System.IO.FileSystem/tests/Configurations.props @@ -6,6 +6,8 @@ netstandard1.3-Windows_NT; netstandard-Unix; netstandard-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index b8c3bb8038..6a8117ad3a 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -5,14 +5,18 @@ <ProjectGuid>{F0D49126-6A1C-42D5-9428-4374C868BAF8}</ProjectGuid> <TestCategories>InnerLoop;OuterLoop</TestCategories> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> <Compile Include="FileInfo\Serialization.cs" /> <Compile Include="FileInfo\Replace.cs" /> diff --git a/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln index 839e921095..83100c8d29 100644 --- a/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln +++ b/src/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.IO.IsolatedStorage/tests/Configurations.props b/src/System.IO.IsolatedStorage/tests/Configurations.props index cfc57211a4..742254e254 100644 --- a/src/System.IO.IsolatedStorage/tests/Configurations.props +++ b/src/System.IO.IsolatedStorage/tests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard-Unix; netstandard-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 081f26a7cd..8d1ad2f1cd 100644 --- a/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,10 +6,14 @@ <TestCategories>InnerLoop;OuterLoop</TestCategories> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="$(CommonTestPath)\System\IO\TempDirectory.cs"> <Link>Common\System\IO\TempDirectory.cs</Link> @@ -52,4 +56,4 @@ <Compile Include="System\IO\IsolatedStorage\RemoveTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln index f473d50581..d3c02b179a 100644 --- a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln +++ b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.Build.0 = netstandard1.3-Unix-Release|Any CPU + {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/System.IO.MemoryMappedFiles/tests/Configurations.props b/src/System.IO.MemoryMappedFiles/tests/Configurations.props index 566c16a6e1..fa9e1005a0 100644 --- a/src/System.IO.MemoryMappedFiles/tests/Configurations.props +++ b/src/System.IO.MemoryMappedFiles/tests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj index 0a47e40899..0318cd2d4b 100644 --- a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -1,14 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" /> <Compile Include="MemoryMappedFile.CreateOrOpen.Tests.cs" /> @@ -39,4 +43,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/System.IO.Packaging.sln b/src/System.IO.Packaging/System.IO.Packaging.sln index 0c25cc53cc..2a2584639c 100644 --- a/src/System.IO.Packaging/System.IO.Packaging.sln +++ b/src/System.IO.Packaging/System.IO.Packaging.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {1F827C19-6023-48D3-909F-9F43AB42FAF0}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.IO.Packaging/tests/Configurations.props b/src/System.IO.Packaging/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.IO.Packaging/tests/Configurations.props +++ b/src/System.IO.Packaging/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index 8c226fe046..a9c704e65d 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -1,11 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Tests.cs" /> </ItemGroup> @@ -13,4 +15,4 @@ <SupplementalTestData Include="$(PackagesDir)System.IO.Packaging.TestData\1.0.0-prerelease\content\**\*.*" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 8527b931ab..e1624750a0 100644 --- a/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln +++ b/src/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU diff --git a/src/System.IO.Pipes.AccessControl/tests/Configurations.props b/src/System.IO.Pipes.AccessControl/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.IO.Pipes.AccessControl/tests/Configurations.props +++ b/src/System.IO.Pipes.AccessControl/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj index bf51537a88..620f2b21cd 100644 --- a/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj +++ b/src/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{A0356E61-19E1-4722-A53D-5D2616E16312}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AnonymousPipeTests\AnonymousPipeTest.AclExtensions.cs" /> <Compile Include="NamedPipeTests\NamedPipeTest.AclExtensions.cs" /> diff --git a/src/System.IO.Ports/tests/Configurations.props b/src/System.IO.Ports/tests/Configurations.props index 4c7f3b60ae..d7dbaaf6a4 100644 --- a/src/System.IO.Ports/tests/Configurations.props +++ b/src/System.IO.Ports/tests/Configurations.props @@ -1,9 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> netstandard-Windows_NT; - net463-AnyOS; + net463-Windows_NT; + netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project> diff --git a/src/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/System.IO.Ports/tests/System.IO.Ports.Tests.csproj index 39b44d788c..80a0816c92 100644 --- a/src/System.IO.Ports/tests/System.IO.Ports.Tests.csproj +++ b/src/System.IO.Ports/tests/System.IO.Ports.Tests.csproj @@ -6,8 +6,10 @@ <TestCategories>InnerLoop;OuterLoop</TestCategories> </PropertyGroup> <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-AnyOS-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-AnyOS-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Json/System.Json.sln b/src/System.Json/System.Json.sln index a28fecaf06..f3f3dcc57d 100644 --- a/src/System.Json/System.Json.sln +++ b/src/System.Json/System.Json.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.ActiveCfg = netcoreapp1.0-Debug|Any CPU - {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.Build.0 = netcoreapp1.0-Debug|Any CPU - {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.ActiveCfg = netcoreapp1.0-Release|Any CPU - {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.Build.0 = netcoreapp1.0-Release|Any CPU + {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {DC683D60-34EC-4D85-B6E0-E97FDB37A583}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {B11B5B76-F583-44EA-A4B7-3ABD990594F6}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Json/tests/Configurations.props b/src/System.Json/tests/Configurations.props index fa32899de2..2845c11c54 100644 --- a/src/System.Json/tests/Configurations.props +++ b/src/System.Json/tests/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp1.0; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Json/tests/System.Json.Tests.csproj b/src/System.Json/tests/System.Json.Tests.csproj index f481b3efbf..9656c70c54 100644 --- a/src/System.Json/tests/System.Json.Tests.csproj +++ b/src/System.Json/tests/System.Json.Tests.csproj @@ -6,8 +6,8 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> <ItemGroup> <Compile Include="JsonArrayTests.cs" /> <Compile Include="JsonObjectTests.cs" /> diff --git a/src/System.Linq.Expressions/System.Linq.Expressions.sln b/src/System.Linq.Expressions/System.Linq.Expressions.sln index f69104abe5..4410698f7a 100644 --- a/src/System.Linq.Expressions/System.Linq.Expressions.sln +++ b/src/System.Linq.Expressions/System.Linq.Expressions.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Linq.Expressions/tests/Configurations.props b/src/System.Linq.Expressions/tests/Configurations.props index c398e42e89..77a4b65bc9 100644 --- a/src/System.Linq.Expressions/tests/Configurations.props +++ b/src/System.Linq.Expressions/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 0163958253..d22cf1f4a2 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -12,8 +12,10 @@ <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Linq.Expressions" /> <ReferenceFromRuntime Include="System.Linq.Expressions" /> diff --git a/src/System.Linq.Parallel/System.Linq.Parallel.sln b/src/System.Linq.Parallel/System.Linq.Parallel.sln index 7319a7d5a0..e1a95fd44d 100644 --- a/src/System.Linq.Parallel/System.Linq.Parallel.sln +++ b/src/System.Linq.Parallel/System.Linq.Parallel.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.ActiveCfg = netstandard1.6-Debug|Any CPU - {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = netstandard1.6-Debug|Any CPU - {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = netstandard1.6-Release|Any CPU - {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = netstandard1.6-Release|Any CPU + {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Linq.Parallel/tests/Configurations.props b/src/System.Linq.Parallel/tests/Configurations.props index a5a130bbdb..33d0e16adf 100644 --- a/src/System.Linq.Parallel/tests/Configurations.props +++ b/src/System.Linq.Parallel/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.6; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj index 2ba89e8f59..40d1340e43 100644 --- a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj +++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj @@ -1,13 +1,17 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{A7074928-82C3-4739-88FE-9B528977950C}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Release|AnyCPU'" /> <!-- Compiled Source Files --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Release|AnyCPU'" /> <ItemGroup> <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs"> <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link> @@ -83,4 +87,4 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/System.Linq.Queryable.sln b/src/System.Linq.Queryable/System.Linq.Queryable.sln index 41758ca118..5aeee6c235 100644 --- a/src/System.Linq.Queryable/System.Linq.Queryable.sln +++ b/src/System.Linq.Queryable/System.Linq.Queryable.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Linq.Queryable/tests/Configurations.props b/src/System.Linq.Queryable/tests/Configurations.props index c398e42e89..77a4b65bc9 100644 --- a/src/System.Linq.Queryable/tests/Configurations.props +++ b/src/System.Linq.Queryable/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj index 4c008675c5..cea5e7b2a0 100644 --- a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj +++ b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{7B88D79B-B799-4116-A7D0-AED572540CD4}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AggregateTests.cs" /> <Compile Include="AllTests.cs" /> diff --git a/src/System.Linq/tests/Configurations.props b/src/System.Linq/tests/Configurations.props index 236495ef50..463aee0572 100644 --- a/src/System.Linq/tests/Configurations.props +++ b/src/System.Linq/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp; netstandard1.6; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Linq/tests/System.Linq.Tests.csproj b/src/System.Linq/tests/System.Linq.Tests.csproj index 400348dc2f..d2225c1676 100644 --- a/src/System.Linq/tests/System.Linq.Tests.csproj +++ b/src/System.Linq/tests/System.Linq.Tests.csproj @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{7C70BB15-870B-4946-8098-625DACD645A6}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AggregateTests.cs" /> <Compile Include="AllTests.cs" /> @@ -81,4 +83,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Memory/tests/Configurations.props b/src/System.Memory/tests/Configurations.props index 1d8e980ad7..6cc4dcd0eb 100644 --- a/src/System.Memory/tests/Configurations.props +++ b/src/System.Memory/tests/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp-Windows_NT; - netcoreapp1.0-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Memory/tests/System.Memory.Tests.csproj b/src/System.Memory/tests/System.Memory.Tests.csproj index bbf92f0c2b..5263111ed6 100644 --- a/src/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/System.Memory/tests/System.Memory.Tests.csproj @@ -5,10 +5,8 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ProjectGuid>{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp1.0-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="TInt.cs" /> </ItemGroup> 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 b27d4831cf..c61668646d 100644 --- a/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln +++ b/src/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln @@ -31,14 +31,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU - {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = netstandard1.3-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 + {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 {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 diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index a42c45372b..ad48265c9d 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -1,11 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <Compile Include="$(CommonTestPath)\System\Net\Configuration.cs"> <Link>Common\System\Net\Configuration.cs</Link> @@ -18,4 +20,4 @@ <Compile Include="XunitTestAssemblyAtrributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index a57fd80fcc..21fc018e06 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,8 +7,10 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Net.Http.WinHttpHandler" /> </ItemGroup> @@ -140,4 +142,4 @@ <Compile Include="XunitTestAssemblyAtrributes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Http/System.Net.Http.sln b/src/System.Net.Http/System.Net.Http.sln index 1c1236a554..d3f8cf510c 100644 --- a/src/System.Net.Http/System.Net.Http.sln +++ b/src/System.Net.Http/System.Net.Http.sln @@ -35,10 +35,10 @@ Global {C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU {C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Net.Http/tests/UnitTests/Configurations.props b/src/System.Net.Http/tests/UnitTests/Configurations.props index b2db637110..4c498002c4 100644 --- a/src/System.Net.Http/tests/UnitTests/Configurations.props +++ b/src/System.Net.Http/tests/UnitTests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index 0a50fe68df..fa005483eb 100644 --- a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,11 +7,13 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Net.Http" /> <TargetingPackExclusions Include="System.Net.Mail" /> @@ -337,7 +339,7 @@ <Compile Include="MockContent.cs" /> <Compile Include="StreamToStreamCopyTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'"> + <ItemGroup Condition="'$(TargetGroup)' != 'netstandard' And '$(TargetGroup)' != 'netcoreapp'"> <Compile Include="..\..\src\Internal\ICloneable.cs"> <Link>ProductionCode\Internal\ICloneable.cs</Link> </Compile> @@ -346,4 +348,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/System.Net.Mail.sln b/src/System.Net.Mail/System.Net.Mail.sln index b9916f5949..188c6f300c 100644 --- a/src/System.Net.Mail/System.Net.Mail.sln +++ b/src/System.Net.Mail/System.Net.Mail.sln @@ -35,10 +35,10 @@ Global {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 = netstandard-Debug|Any CPU - {2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {2525E37E-0EC1-4374-92FD-D2752BEED978}.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 {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 diff --git a/src/System.Net.Mail/tests/Unit/Configurations.props b/src/System.Net.Mail/tests/Unit/Configurations.props index c398e42e89..77a4b65bc9 100644 --- a/src/System.Net.Mail/tests/Unit/Configurations.props +++ b/src/System.Net.Mail/tests/Unit/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 56f81a5779..92c5b4d306 100644 --- a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,8 +6,10 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> <ProjectGuid>{2525E37E-0EC1-4374-92FD-D2752BEED978}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Base64EncodingTest.cs" /> <Compile Include="ByteEncodingTest.cs" /> @@ -178,4 +180,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/System.Net.NameResolution.sln b/src/System.Net.NameResolution/System.Net.NameResolution.sln index 4ad8b011d3..1adbcff3b6 100644 --- a/src/System.Net.NameResolution/System.Net.NameResolution.sln +++ b/src/System.Net.NameResolution/System.Net.NameResolution.sln @@ -36,18 +36,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = netstandard1.3-Unix-Release|Any CPU - {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU - {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.Build.0 = netstandard1.3-Unix-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 + {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 {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 diff --git a/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props b/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props index 8b21be4cd6..a20c412f56 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/FunctionalTests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard1.3-Windows_NT; netstandard1.3-Unix; + netstandard-Windows_NT; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj index c89d3ff7d9..d4b88fc4bb 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj +++ b/src/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj @@ -1,14 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{4FE5ECEE-ACC5-4558-A946-573426599B73}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="GetHostByAddressTest.cs" /> <Compile Include="GetHostByNameTest.cs" /> @@ -20,4 +24,4 @@ <Compile Include="TestSettings.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/PalTests/Configurations.props b/src/System.Net.NameResolution/tests/PalTests/Configurations.props index a20c412f56..50a461d6bb 100644 --- a/src/System.Net.NameResolution/tests/PalTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/PalTests/Configurations.props @@ -6,6 +6,8 @@ netstandard1.3-Unix; netstandard-Windows_NT; netstandard-Unix; + netcoreapp-Windows_NT; + netcoreapp-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 15e2d00ae9..ff752aeeb3 100644 --- a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,15 +7,19 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Net.NameResolution" /> </ItemGroup> @@ -65,7 +69,7 @@ <Link>Common\System\Net\DebugSafeHandle.cs</Link> </Compile> <!-- Common --> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" Condition="'$(TargetGroup)' != 'netstandard'"> + <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" Condition="'$(TargetGroup)' != 'netstandard' And '$(TargetGroup)' != 'netcoreapp'"> <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> </Compile> <!-- System.Net.Internals --> @@ -173,4 +177,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/UnitTests/Configurations.props b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props index 8b21be4cd6..50a461d6bb 100644 --- a/src/System.Net.NameResolution/tests/UnitTests/Configurations.props +++ b/src/System.Net.NameResolution/tests/UnitTests/Configurations.props @@ -4,6 +4,10 @@ <BuildConfigurations> netstandard1.3-Windows_NT; netstandard1.3-Unix; + netstandard-Windows_NT; + netstandard-Unix; + netcoreapp-Windows_NT; + netcoreapp-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index 102faf1ab3..d7fe149358 100644 --- a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,11 +7,19 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Net.NameResolution" /> </ItemGroup> @@ -44,4 +52,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln index 0394de66c8..f1a93c29d7 100644 --- a/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln +++ b/src/System.Net.NetworkInformation/System.Net.NetworkInformation.sln @@ -35,10 +35,10 @@ Global {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 = netstandard-Debug|Any CPU - {2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}.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 {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 diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props index b2db637110..4c498002c4 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props +++ b/src/System.Net.NetworkInformation/tests/UnitTests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj index bddfe1c212..6744ea09e4 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj +++ b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,10 +7,12 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="NetworkInterfaceTest.cs" /> <!-- Fakes --> @@ -63,4 +65,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/System.Net.Primitives.sln b/src/System.Net.Primitives/System.Net.Primitives.sln index 534f71ec4a..380882b714 100644 --- a/src/System.Net.Primitives/System.Net.Primitives.sln +++ b/src/System.Net.Primitives/System.Net.Primitives.sln @@ -45,18 +45,18 @@ Global {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 = netstandard-Windows_NT-Debug|Any CPU - {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {7860A11A-1841-4416-8A30-28EEEB42C6BB}.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 = netstandard-Windows_NT-Debug|Any CPU - {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.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 {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 diff --git a/src/System.Net.Primitives/tests/PalTests/Configurations.props b/src/System.Net.Primitives/tests/PalTests/Configurations.props index 186604c3fe..f0d212d911 100644 --- a/src/System.Net.Primitives/tests/PalTests/Configurations.props +++ b/src/System.Net.Primitives/tests/PalTests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard-Unix; netstandard-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; netstandard1.3-Windows_NT; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 9ec30209f6..689b12c295 100644 --- a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,12 +7,16 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <PropertyGroup> <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the System.Net.Internals namespace. --> @@ -27,7 +31,7 @@ <Compile Include="HostInformationPalTest.cs" /> <Compile Include="SocketAddressPalTest.cs" /> <Compile Include="Fakes\NetEventSource.cs" /> - <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard'" /> + <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard' And '$(TargetGroup)' != 'netcoreapp'" /> <Compile Include="..\..\src\System\Net\EndPoint.cs"> <Link>ProductionCode\System\Net\EndPoint.cs</Link> </Compile> @@ -172,4 +176,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/UnitTests/Configurations.props b/src/System.Net.Primitives/tests/UnitTests/Configurations.props index 9348ce4cb3..cc96282e25 100644 --- a/src/System.Net.Primitives/tests/UnitTests/Configurations.props +++ b/src/System.Net.Primitives/tests/UnitTests/Configurations.props @@ -5,6 +5,8 @@ netstandard-Windows_NT; netstandard-Unix; netstandard1.3-Windows_NT; + netcoreapp-Windows_NT; + netcoreapp-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index 41cd404803..014ba7e292 100644 --- a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -8,12 +8,16 @@ <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <PropertyGroup> <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the System.Net.Internals namespace. --> @@ -30,7 +34,7 @@ <Compile Include="Fakes\HostInformation.cs" /> <Compile Include="Fakes\IPAddressPal.cs" /> <Compile Include="Fakes\CookieException.cs" /> - <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard' And '$(TargetGroup)' != 'netstandard1.3'" /> + <Compile Include="Fakes\Serialization.cs" Condition="'$(TargetGroup)' != 'netstandard' And '$(TargetGroup)' != 'netstandard1.3' And '$(TargetGroup)' != 'netcoreapp'" /> <Compile Include="..\..\src\System\Net\Cookie.cs"> <Link>ProductionCode\System\Net\Cookie.cs</Link> </Compile> @@ -131,4 +135,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/System.Net.Sockets.sln b/src/System.Net.Sockets/System.Net.Sockets.sln index abcad65a66..8a3f64f578 100644 --- a/src/System.Net.Sockets/System.Net.Sockets.sln +++ b/src/System.Net.Sockets/System.Net.Sockets.sln @@ -35,10 +35,10 @@ Global {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 = netstandard1.3-Unix-Debug|Any CPU - {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = netstandard1.3-Unix-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 {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 diff --git a/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props b/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props index 8b21be4cd6..a20c412f56 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props +++ b/src/System.Net.Sockets/tests/PerformanceTests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard1.3-Windows_NT; netstandard1.3-Unix; + netstandard-Windows_NT; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj index 629a940174..dbaf87e754 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj +++ b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj @@ -1,14 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="SocketPerformanceAsyncTests.cs" /> <Compile Include="SocketTestClientAPMMock.cs" /> @@ -60,4 +64,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln index 38be489396..46247594ba 100644 --- a/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln +++ b/src/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Net.WebHeaderCollection/tests/Configurations.props b/src/System.Net.WebHeaderCollection/tests/Configurations.props index 211cd2bec8..cf10431a14 100644 --- a/src/System.Net.WebHeaderCollection/tests/Configurations.props +++ b/src/System.Net.WebHeaderCollection/tests/Configurations.props @@ -3,7 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj index 6a4768dbd8..c9fae3493e 100644 --- a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj +++ b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj @@ -1,14 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="WebHeaderCollectionTest.cs" /> </ItemGroup> @@ -20,4 +20,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 febf97cae4..6a66233842 100644 --- a/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln +++ b/src/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.Build.0 = netstandard1.3-Unix-Release|Any CPU + {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Net.WebSockets.Client/tests/Configurations.props b/src/System.Net.WebSockets.Client/tests/Configurations.props index 566c16a6e1..354a3dc6cb 100644 --- a/src/System.Net.WebSockets.Client/tests/Configurations.props +++ b/src/System.Net.WebSockets.Client/tests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 8d05cf4302..3f87f66b2c 100644 --- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,11 +6,15 @@ <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <TargetingPackExclusions Include="System.Configuration" /> </ItemGroup> @@ -42,4 +46,4 @@ <Compile Include="WebSocketHelper.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/System.Net.WebSockets.sln b/src/System.Net.WebSockets/System.Net.WebSockets.sln index df8c398305..cc0deebb01 100644 --- a/src/System.Net.WebSockets/System.Net.WebSockets.sln +++ b/src/System.Net.WebSockets/System.Net.WebSockets.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Net.WebSockets/tests/Configurations.props b/src/System.Net.WebSockets/tests/Configurations.props index c398e42e89..77a4b65bc9 100644 --- a/src/System.Net.WebSockets/tests/Configurations.props +++ b/src/System.Net.WebSockets/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj index 568bb1f718..368593cf07 100644 --- a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj +++ b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj @@ -5,8 +5,10 @@ <ProjectGuid>{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="WebSocketTests.cs" /> </ItemGroup> diff --git a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln index cf051097f4..d928320b9b 100644 --- a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9906F1A-A41A-43CD-81D2-BA94CF0001C9}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/System.Numerics.Vectors/tests/Configurations.props b/src/System.Numerics.Vectors/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Numerics.Vectors/tests/Configurations.props +++ b/src/System.Numerics.Vectors/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj index 343b12caf4..97f9724531 100644 --- a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj +++ b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj @@ -6,8 +6,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="..\src\System\Numerics\ConstantHelper.cs"> <AutoGen>True</AutoGen> 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 1a7e4390cc..42b6e0b56f 100644 --- a/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln +++ b/src/System.Private.Xml.Linq/System.Private.Xml.Linq.sln @@ -83,10 +83,10 @@ Global {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 = netstandard1.3-Debug|Any CPU - {C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = netstandard1.3-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 @@ -111,14 +111,14 @@ Global {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 = netstandard1.3-Debug|Any CPU - {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU - {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = netstandard1.3-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 diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj index ebef5e950b..36e815de79 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -8,8 +8,10 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="BridgeHelpers.cs" /> <Compile Include="CXmlCache.cs" /> @@ -26,4 +28,4 @@ <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj index 9f26c40448..0586d44c02 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj @@ -6,6 +6,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Private.Xml.Linq/tests/events/Configurations.props b/src/System.Private.Xml.Linq/tests/events/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/events/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/events/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj index 6e48dd4cfb..4b2b4dd596 100644 --- a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{C560E194-5B14-4112-ABC6-3208491E53E6}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="EventsAdd.cs" /> <Compile Include="EventsName.cs" /> @@ -22,4 +24,4 @@ <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/System.Reflection.Context.sln b/src/System.Reflection.Context/System.Reflection.Context.sln index 1b1454c634..57056d8efa 100644 --- a/src/System.Reflection.Context/System.Reflection.Context.sln +++ b/src/System.Reflection.Context/System.Reflection.Context.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Reflection.Context/tests/Configurations.props b/src/System.Reflection.Context/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Reflection.Context/tests/Configurations.props +++ b/src/System.Reflection.Context/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj index 94f104b939..b361939b7d 100644 --- a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj +++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="CustomReflectionContextTests.cs" /> </ItemGroup> diff --git a/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln index cb4f2ba480..cf0cd0a90b 100644 --- a/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln +++ b/src/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Reflection.DispatchProxy/tests/Configurations.props b/src/System.Reflection.DispatchProxy/tests/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Reflection.DispatchProxy/tests/Configurations.props +++ b/src/System.Reflection.DispatchProxy/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj index 6d7a0bdcf2..b6da092872 100644 --- a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj +++ b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj @@ -1,15 +1,19 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{089444FE-8FF5-4D8F-A51B-32D026425F6B}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="DispatchProxyTests.cs" /> <Compile Include="TestTypes.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 03b43a9ed8..c2ec6ed5d6 100644 --- a/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln +++ b/src/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {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 diff --git a/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props +++ b/src/System.Reflection.Emit.ILGeneration/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj index d5cf8d550e..b2ca4f17d0 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj +++ b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj @@ -1,12 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{FB037640-0591-4DF4-A331-0BEFE50A200B}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="ILGenerator\DeclareLocalTests.cs" /> <Compile Include="ILGenerator\DefineLabelTests.cs" /> @@ -37,4 +41,4 @@ <Compile Include="Utilities.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 0d17d73e77..71975a2f99 100644 --- a/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln +++ b/src/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {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 diff --git a/src/System.Reflection.Emit.Lightweight/tests/Configurations.props b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/Configurations.props +++ b/src/System.Reflection.Emit.Lightweight/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj index 4786ee6751..18dd86e2bc 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj +++ b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj @@ -1,12 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="DynamicMethodCreateDelegate.cs" /> <Compile Include="DynamicMethodCtor.cs" /> @@ -17,4 +21,4 @@ <Compile Include="Utilities.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/System.Reflection.Emit.sln b/src/System.Reflection.Emit/System.Reflection.Emit.sln index f4ce254d04..43eca57e2b 100644 --- a/src/System.Reflection.Emit/System.Reflection.Emit.sln +++ b/src/System.Reflection.Emit/System.Reflection.Emit.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {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 diff --git a/src/System.Reflection.Emit/tests/Configurations.props b/src/System.Reflection.Emit/tests/Configurations.props index b2db637110..4c498002c4 100644 --- a/src/System.Reflection.Emit/tests/Configurations.props +++ b/src/System.Reflection.Emit/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj index 4f63b2fcbb..713a9a409f 100644 --- a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj +++ b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{1104A263-331A-4CA0-B541-759BD20F7B1D}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AssemblyBuilderTests.cs" /> <Compile Include="ConstructorBuilder\ConstructorBuilderDefineParameter.cs" /> @@ -116,4 +118,4 @@ <Compile Include="TypeBuilder\TypeBuilderCreateType.netstandard.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/System.Reflection.Extensions/System.Reflection.Extensions.sln index 8d0d646f57..2725e72bec 100644 --- a/src/System.Reflection.Extensions/System.Reflection.Extensions.sln +++ b/src/System.Reflection.Extensions/System.Reflection.Extensions.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Reflection.Extensions/tests/Configurations.props b/src/System.Reflection.Extensions/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Reflection.Extensions/tests/Configurations.props +++ b/src/System.Reflection.Extensions/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj index 45e6b16c9d..82e03a395c 100644 --- a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj +++ b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Definitions\ConstructorDefinitions.cs" /> <Compile Include="Definitions\EventDefinitions.cs" /> @@ -22,4 +24,4 @@ <Compile Include="RuntimeReflectionExtensionTestsWithQuirks.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln index 8805233c82..bfb39ea643 100644 --- a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln +++ b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU + {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Reflection.Metadata/tests/Configurations.props b/src/System.Reflection.Metadata/tests/Configurations.props index 2c5652de53..c43af8d511 100644 --- a/src/System.Reflection.Metadata/tests/Configurations.props +++ b/src/System.Reflection.Metadata/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index be3f6b3177..40688ead93 100644 --- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,8 +7,12 @@ <ExternallyShipping>false</ExternallyShipping> <RootNamespace>System.Reflection.Metadata.Tests</RootNamespace> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="..\..\Common\src\Interop\Windows\Interop.Libraries.cs"> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link> @@ -132,4 +136,4 @@ <EmbeddedResource Include="Resources\Misc\Signed.exe" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln index caddffe13f..6762ab6efe 100644 --- a/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln +++ b/src/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln @@ -31,10 +31,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU + {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {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 diff --git a/src/System.Reflection.TypeExtensions/tests/Configurations.props b/src/System.Reflection.TypeExtensions/tests/Configurations.props index 2c5652de53..c43af8d511 100644 --- a/src/System.Reflection.TypeExtensions/tests/Configurations.props +++ b/src/System.Reflection.TypeExtensions/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj index 636c8d2658..fdba82e605 100644 --- a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj +++ b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj @@ -5,8 +5,12 @@ <ProjectGuid>{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AssemblyExtensionTests.cs" /> <Compile Include="ConstructorInfo\ConstructorInfoInvokeArrayTests.cs" /> diff --git a/src/System.Reflection/System.Reflection.sln b/src/System.Reflection/System.Reflection.sln index 0bb150354a..b9fbaa1427 100644 --- a/src/System.Reflection/System.Reflection.sln +++ b/src/System.Reflection/System.Reflection.sln @@ -36,18 +36,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU + {B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {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 = netstandard1.5-Debug|Any CPU - {8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.Build.0 = netstandard1.5-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 diff --git a/src/System.Reflection/tests/Configurations.props b/src/System.Reflection/tests/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Reflection/tests/Configurations.props +++ b/src/System.Reflection/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection/tests/System.Reflection.Tests.csproj b/src/System.Reflection/tests/System.Reflection.Tests.csproj index 42b1a11f63..4d3d8004ac 100644 --- a/src/System.Reflection/tests/System.Reflection.Tests.csproj +++ b/src/System.Reflection/tests/System.Reflection.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{B027C72E-F04E-42E0-A7F7-993AEF8400D2}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AssemblyNameTests.cs" /> <Compile Include="AssemblyTests.cs" /> @@ -40,4 +42,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Reflection/tests/TestExe/Configurations.props b/src/System.Reflection/tests/TestExe/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Reflection/tests/TestExe/Configurations.props +++ b/src/System.Reflection/tests/TestExe/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj b/src/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj index eec75560cf..2982aee450 100644 --- a/src/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj +++ b/src/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj @@ -7,6 +7,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> 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 67ab9f84c4..4d91d68065 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln +++ b/src/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = netstandard1.0-Windows_NT-Debug|Any CPU {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = netstandard1.0-Windows_NT-Debug|Any CPU {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = netstandard1.0-Windows_NT-Release|Any CPU diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index c74f908772..d2742f7603 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj @@ -6,8 +6,10 @@ <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> <ProjectGuid>{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="UnsafeTests.cs" /> </ItemGroup> diff --git a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln index b1817075b5..1dc16ea74c 100644 --- a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln +++ b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln @@ -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 = netstandard1.5-Debug|Any CPU - ad83807c-8be5-4f27-85df-9793613233e1.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - ad83807c-8be5-4f27-85df-9793613233e1.Release|Any CPU.Build.0 = netstandard1.5-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 = netstandard1.5-Debug|Any CPU - {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU - {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU - {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.Build.0 = netstandard1.5-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 {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 diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj index a76392925e..e4e79973e6 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj @@ -7,6 +7,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/Configurations.props b/src/System.Runtime.Extensions/tests/Configurations.props index ad85f94e9e..b117e5a4e8 100644 --- a/src/System.Runtime.Extensions/tests/Configurations.props +++ b/src/System.Runtime.Extensions/tests/Configurations.props @@ -6,6 +6,8 @@ netcoreapp-Unix; netstandard1.5-Unix; netstandard1.5-Windows_NT; + netstandard-Windows_NT; + netstandard-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 803539ec6d..f2e41ef8f9 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -7,14 +7,18 @@ <DefineConstants Condition="'$(TargetGroup)'=='netstandard2.0'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Windows_NT-Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)'=='netcoreapp'"> <Compile Include="System\ApplicationIdTests.cs" /> <Compile Include="System\IO\PathTests.netstandard.cs" /> @@ -122,4 +126,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props +++ b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj index f57a318162..6d9b68c099 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj +++ b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj @@ -8,6 +8,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props +++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj index 04d7dac966..02a94799a4 100644 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj +++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj @@ -8,6 +8,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj index d8436fe29d..1a4b4bd8c9 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj @@ -8,6 +8,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> 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 2f978d3230..0ad13ec027 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln +++ b/src/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.ActiveCfg = netstandard1.3-Unix-Debug|Any CPU - {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.Build.0 = netstandard1.3-Unix-Debug|Any CPU - {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.ActiveCfg = netstandard1.3-Unix-Release|Any CPU - {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.Build.0 = netstandard1.3-Unix-Release|Any CPU + {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props index 566c16a6e1..fa9e1005a0 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props @@ -4,6 +4,8 @@ <BuildConfigurations> netstandard1.3-Unix; netstandard1.3-Windows_NT; + netstandard-Unix; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj index 621b90f4f3..e04a66c827 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,14 +6,18 @@ <ProjectGuid>{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="CheckArchitectureTests.cs" /> <Compile Include="CheckPlatformTests.cs" /> <Compile Include="DescriptionNameTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln index 338c0927cd..c68e37410f 100644 --- a/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln +++ b/src/System.Runtime.InteropServices/System.Runtime.InteropServices.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {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 diff --git a/src/System.Runtime.InteropServices/tests/Configurations.props b/src/System.Runtime.InteropServices/tests/Configurations.props index c398e42e89..77a4b65bc9 100644 --- a/src/System.Runtime.InteropServices/tests/Configurations.props +++ b/src/System.Runtime.InteropServices/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj index 7f3d000371..bc744f44a6 100644 --- a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj +++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{A824F4CD-935B-4496-A1B2-C3664936DA7B}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttributeTests.cs" /> <Compile Include="System\Runtime\InteropServices\HandleCollectorTests.cs" /> @@ -40,4 +42,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ 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 82c2e36089..305b30df15 100644 --- a/src/System.Runtime.Loader/System.Runtime.Loader.sln +++ b/src/System.Runtime.Loader/System.Runtime.Loader.sln @@ -46,10 +46,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = netstandard1.6-Debug|Any CPU - {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = netstandard1.6-Debug|Any CPU - {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.ActiveCfg = netstandard1.6-Release|Any CPU - {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.Build.0 = netstandard1.6-Release|Any CPU + {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {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 diff --git a/src/System.Runtime.Loader/tests/Configurations.props b/src/System.Runtime.Loader/tests/Configurations.props index a5a130bbdb..33d0e16adf 100644 --- a/src/System.Runtime.Loader/tests/Configurations.props +++ b/src/System.Runtime.Loader/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.6; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj index 962324850d..539df868fb 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj @@ -6,6 +6,10 @@ <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}</ProjectGuid> <RootNamespace>System.Runtime.Loader.Tests</RootNamespace> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/System.Runtime.Numerics/System.Runtime.Numerics.sln index 0f063ecf11..51adbe2656 100644 --- a/src/System.Runtime.Numerics/System.Runtime.Numerics.sln +++ b/src/System.Runtime.Numerics/System.Runtime.Numerics.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Runtime.Numerics/tests/Configurations.props b/src/System.Runtime.Numerics/tests/Configurations.props index 211cd2bec8..a46649cccc 100644 --- a/src/System.Runtime.Numerics/tests/Configurations.props +++ b/src/System.Runtime.Numerics/tests/Configurations.props @@ -3,7 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard; + netstandard-Windows_NT;; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj index 49a551e013..de803192ba 100644 --- a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj +++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj @@ -1,14 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="BigInteger\absolutevalue.cs" /> <Compile Include="BigInteger\BigIntegerToStringTests.cs" /> @@ -60,4 +60,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 c2940542f0..b32ea12627 100644 --- a/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln +++ b/src/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Security.Cryptography.Algorithms/tests/Configurations.props b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props index dbe4492ae3..27e23000a0 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/Configurations.props +++ b/src/System.Security.Cryptography.Algorithms/tests/Configurations.props @@ -6,6 +6,8 @@ netstandard1.6-Windows_NT; netstandard-Unix; netstandard-Windows_NT; + netcoreapp-Windows_NT; + netcoreapp-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 9c40538731..c956377b86 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -5,6 +5,10 @@ <ProjectGuid>{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}</ProjectGuid> <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> 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 ac56907335..48cf009736 100644 --- a/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln +++ b/src/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Security.Cryptography.Cng/tests/Configurations.props b/src/System.Security.Cryptography.Cng/tests/Configurations.props index 1772b8de4d..240299e391 100644 --- a/src/System.Security.Cryptography.Cng/tests/Configurations.props +++ b/src/System.Security.Cryptography.Cng/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.6-Windows_NT; netstandard-Windows_NT; + netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index cc0371c734..5531250960 100644 --- a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,10 +6,12 @@ <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="CreateTests.cs" /> <Compile Include="HandleTests.cs" /> @@ -156,4 +158,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 0a3de3858f..fcb8325600 100644 --- a/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln +++ b/src/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU - {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU - {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU - {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU + {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Security.Cryptography.Csp/tests/Configurations.props b/src/System.Security.Cryptography.Csp/tests/Configurations.props index cf10431a14..c4d29c8de0 100644 --- a/src/System.Security.Cryptography.Csp/tests/Configurations.props +++ b/src/System.Security.Cryptography.Csp/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3-Windows_NT; netstandard-Windows_NT; + netcoreapp-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index 65ad434577..a309fd7273 100644 --- a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{A05C2EF2-A986-448C-9C63-735CC17409AA}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="CspParametersTests.cs" /> <Compile Include="ImportExportCspBlob.cs" /> @@ -111,4 +113,4 @@ <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 13124013d1..e4df70686f 100644 --- a/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln +++ b/src/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.ActiveCfg = netstandard-Unix-Debug|Any CPU - {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.Build.0 = netstandard-Unix-Debug|Any CPU - {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.ActiveCfg = netstandard-Unix-Release|Any CPU - {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.Build.0 = netstandard-Unix-Release|Any CPU + {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.ActiveCfg = netcoreapp-Unix-Debug|Any CPU + {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.Build.0 = netcoreapp-Unix-Debug|Any CPU + {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.ActiveCfg = netcoreapp-Unix-Release|Any CPU + {E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.Build.0 = netcoreapp-Unix-Release|Any CPU {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props index b975ea34b6..1be226e676 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props +++ b/src/System.Security.Cryptography.OpenSsl/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.6-Unix; netstandard-Unix; + netcoreapp-Unix; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index 5fff465a1e..665d0885e8 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -5,10 +5,12 @@ <ProjectGuid>{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}</ProjectGuid> <UnsupportedPlatforms>Windows_NT</UnsupportedPlatforms> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.6-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Unix-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.6-Unix-Release|AnyCPU'" /> <ItemGroup> <Compile Include="EcDsaOpenSslTests.cs" /> <Compile Include="RSAOpenSslProvider.cs" /> diff --git a/src/System.Security.Cryptography.Pkcs/tests/Configurations.props b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props index c51fd14e1d..094803eb97 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/Configurations.props +++ b/src/System.Security.Cryptography.Pkcs/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netcoreapp-Windows_NT; netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index 838737d1e2..680e946850 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -8,10 +8,12 @@ </PropertyGroup> <!-- Don't delete these clauses even if they look useless. They tell the VS IDE that "Windows_Debug", etc., are valid configuration for this project and stop it from trying to "fix up" the .sln file --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> @@ -40,4 +42,4 @@ <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 c90a901aea..2de4bce9fa 100644 --- a/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln +++ b/src/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU + {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU + {101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU + {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU + {101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Security.Cryptography.Primitives/tests/Configurations.props b/src/System.Security.Cryptography.Primitives/tests/Configurations.props index d529158e05..c9f54892c7 100644 --- a/src/System.Security.Cryptography.Primitives/tests/Configurations.props +++ b/src/System.Security.Cryptography.Primitives/tests/Configurations.props @@ -3,8 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netcoreapp; - netstandard; + netcoreapp-Windows_NT;; + netstandard-Windows_NT;; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 6b9f140990..2c8f10f616 100644 --- a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj +++ b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj @@ -7,10 +7,10 @@ <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11;netstandard17</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netstandard'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> 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 c80c79f747..09e45b6dbb 100644 --- a/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln +++ b/src/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU {FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {FB39F994-1504-4B96-9588-E0385D3B73F1}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU diff --git a/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props +++ b/src/System.Security.Cryptography.ProtectedData/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index 216eb423b6..1727607396 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj +++ b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj @@ -5,6 +5,8 @@ <ProjectGuid>{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Security.SecureString/System.Security.SecureString.sln b/src/System.Security.SecureString/System.Security.SecureString.sln index 6e27eae385..8c622ae7a3 100644 --- a/src/System.Security.SecureString/System.Security.SecureString.sln +++ b/src/System.Security.SecureString/System.Security.SecureString.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Security.SecureString/tests/Configurations.props b/src/System.Security.SecureString/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Security.SecureString/tests/Configurations.props +++ b/src/System.Security.SecureString/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj index 5a445bc15a..5d028c5935 100644 --- a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj +++ b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> @@ -6,10 +6,12 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="SecureStringTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 86b0419e6d..0f087e91d4 100644 --- a/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln +++ b/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU - {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU - {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU - {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Text.Encoding.CodePages/tests/Configurations.props b/src/System.Text.Encoding.CodePages/tests/Configurations.props index 211cd2bec8..cf10431a14 100644 --- a/src/System.Text.Encoding.CodePages/tests/Configurations.props +++ b/src/System.Text.Encoding.CodePages/tests/Configurations.props @@ -3,7 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; - netstandard; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index 69e24fb3d4..885dba7f9d 100644 --- a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj +++ b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj @@ -5,10 +5,10 @@ <ProjectGuid>{835AD07B-7C9A-406F-B16F-59B3B0D017A4}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="EncodingCodePages.cs" /> </ItemGroup> 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 9100255b06..29976429df 100644 --- a/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln +++ b/src/System.Text.Encodings.Web/System.Text.Encodings.Web.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {B7EDBF00-765A-48E8-B593-CD668288E274}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Text.Encodings.Web/tests/Configurations.props b/src/System.Text.Encodings.Web/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Text.Encodings.Web/tests/Configurations.props +++ b/src/System.Text.Encodings.Web/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj index 22a8ee7f52..d5f95f2648 100644 --- a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj +++ b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj @@ -11,6 +11,8 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/System.Threading.AccessControl/System.Threading.AccessControl.sln index 571938e7dd..09df4b92d4 100644 --- a/src/System.Threading.AccessControl/System.Threading.AccessControl.sln +++ b/src/System.Threading.AccessControl/System.Threading.AccessControl.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU - {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU - {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU - {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU + {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU + {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU + {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU + {458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU diff --git a/src/System.Threading.AccessControl/tests/Configurations.props b/src/System.Threading.AccessControl/tests/Configurations.props index 5f482b878b..cf10431a14 100644 --- a/src/System.Threading.AccessControl/tests/Configurations.props +++ b/src/System.Threading.AccessControl/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3-Windows_NT; + netstandard-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index 2be86f535b..5b387677cb 100644 --- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -4,8 +4,10 @@ <PropertyGroup> <ProjectGuid>{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Windows_NT-Release|AnyCPU'" /> <ItemGroup> <Compile Include="MutexSecurityTests.cs" /> <Compile Include="ThreadingAclExtensionsTests.cs" /> 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 5ea8034162..0fe362572e 100644 --- a/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln +++ b/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU {2E2F7224-7C72-4A81-9625-A5241F8D836D}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU diff --git a/src/System.Threading.Tasks.Dataflow/tests/Configurations.props b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/Configurations.props +++ b/src/System.Threading.Tasks.Dataflow/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index ba1143c4c1..4305437ad5 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj +++ b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj @@ -1,11 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{72E21903-0FBA-444E-9855-3B4F05DFC1F9}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Dataflow\*.cs" /> <Compile Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorTestBase.cs"> @@ -28,4 +30,4 @@ </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file 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 4ee105baad..ce20373cad 100644 --- a/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln +++ b/src/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln @@ -19,10 +19,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Threading.Tasks.Extensions/tests/Configurations.props b/src/System.Threading.Tasks.Extensions/tests/Configurations.props index c3266e1e93..4c498002c4 100644 --- a/src/System.Threading.Tasks.Extensions/tests/Configurations.props +++ b/src/System.Threading.Tasks.Extensions/tests/Configurations.props @@ -3,6 +3,8 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; + netcoreapp; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj index 8703caac6d..b6be34a67c 100644 --- a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj +++ b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj @@ -4,8 +4,12 @@ <PropertyGroup> <ProjectGuid>{275B161B-D525-48A0-B1DE-344273AB9A99}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="AsyncMethodBuilderAttributeTests.cs" /> <Compile Include="AsyncValueTaskMethodBuilderTests.cs" /> 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 46a2daa4c1..8b7c0f420d 100644 --- a/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln +++ b/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.ActiveCfg = netstandard1.5-Debug|Any CPU - {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = netstandard1.5-Debug|Any CPU - {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = netstandard1.5-Release|Any CPU - {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = netstandard1.5-Release|Any CPU + {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.Threading.Tasks.Parallel/tests/Configurations.props b/src/System.Threading.Tasks.Parallel/tests/Configurations.props index 2c5652de53..800e963c80 100644 --- a/src/System.Threading.Tasks.Parallel/tests/Configurations.props +++ b/src/System.Threading.Tasks.Parallel/tests/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.5; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj index 95b06c148c..3947be96ab 100644 --- a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj +++ b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}</ProjectGuid> <AppDesignerFolder>Properties</AppDesignerFolder> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.5-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <PropertyGroup> <StartupObject /> </PropertyGroup> @@ -34,4 +36,4 @@ </Compile> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/tests/Configurations.props b/src/System.ValueTuple/tests/Configurations.props index 7bf1970590..b1af5b762e 100644 --- a/src/System.ValueTuple/tests/Configurations.props +++ b/src/System.ValueTuple/tests/Configurations.props @@ -4,6 +4,7 @@ <BuildConfigurations> netstandard1.3; netcoreapp; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj index a38806c490..d446b4358c 100644 --- a/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj +++ b/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj @@ -10,6 +10,8 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> |