diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-12-14 22:19:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-14 22:19:06 +0300 |
| commit | 3403b4f6a11fd6ba53551c9d55de25fbb83bdc85 (patch) | |
| tree | 2b329fcaa8de496bf759c441fdd16cc243e7f10e /src | |
| parent | 9a34009809e25f648405eca7368ab8443243a043 (diff) | |
Make Test projects compile against the Targeting pack. (1/3 of the work) (#14482)
Diffstat (limited to 'src')
85 files changed, 116 insertions, 920 deletions
diff --git a/src/Common/test-runtime/XUnit.Runtime.depproj b/src/Common/test-runtime/XUnit.Runtime.depproj index 7ec20f1420..8a725a7fec 100644 --- a/src/Common/test-runtime/XUnit.Runtime.depproj +++ b/src/Common/test-runtime/XUnit.Runtime.depproj @@ -27,7 +27,8 @@ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Microsoft.DotNet.xunit.performance.run.core' And '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR' And '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='runtime.win7-x64.Microsoft.NETCore.TestHost' And - '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='runtime.win7-x64.Microsoft.NETCore.Jit' + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='runtime.win7-x64.Microsoft.NETCore.Jit' And + '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Newtonsoft.Json' " /> </ItemGroup> </Target> diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json index 86686eb072..ae269ce485 100644 --- a/src/Common/test-runtime/project.json +++ b/src/Common/test-runtime/project.json @@ -9,6 +9,7 @@ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24728-02", "Microsoft.NETCore.TestHost": "1.2.0-beta-24728-02", + "Newtonsoft.Json": "9.0.1" }, "frameworks": { "netstandard1.7": {} diff --git a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index 34a0f7cc1c..e30befb8c6 100644 --- a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -2,13 +2,9 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>ModuleCore</AssemblyName> - <RootNamespace>OLEDB.Test.ModuleCore</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> @@ -31,11 +27,5 @@ <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 fc415864af..374ada6fe8 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj +++ b/src/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{89701565-F68B-46D9-BD78-95B0F052C50B}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>XmlCoreTest</AssemblyName> <RootNamespace>XmlCoreTest.Common</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> diff --git a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj index e0eecf98bc..e35742c9c3 100644 --- a/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj +++ b/src/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}</ProjectGuid> - <OutputType>Library</OutputType> <AssemblyName>XmlDiff</AssemblyName> <RootNamespace>System.Xml.XmlDiff</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> </PropertyGroup> diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj index fda650dd60..14d1b979d8 100644 --- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{ACF79A18-2655-452C-B4AC-10125F0AD7A8}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Xml.Xsl.XslTransformApi.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,7 +33,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </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/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj index 68631c39ce..275c0a445b 100644 --- a/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B01E2AE1-1B52-4518-B32E-016070356A7F}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>XsltCompiler.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -18,11 +12,6 @@ <OutputPath>$(OutputPath)\$(RootNamespace)\$(AssemblyName)</OutputPath> </PropertyGroup> <ItemGroup> - <!--<Reference Include="TestStylesheet"> - <HintPath>.\TestStylesheet.dll</HintPath> - </Reference>--> - </ItemGroup> - <ItemGroup> <Compile Include="CommonScenarios\XsltcTestBasicFunctionality.cs" /> <Compile Include="CommonScenarios\XsltcTestCaseBase.cs" /> <Compile Include="CommonScenarios\XsltcTestClassname.cs" /> @@ -43,7 +32,6 @@ <ProjectReference Include="$(CommonTestPath)\System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> <ProjectReference Include="$(CommonTestPath)\System\Xml\XmlDiff\XmlDiff.csproj" /> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <ItemGroup> <Content Include="Identity.xslt" /> @@ -57,4 +45,4 @@ <Content Include="TestStylesheet.xslt" /> </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/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj index 8285b594a2..4acdb5f026 100644 --- a/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XsltScenarios/XsltScenarios.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{540FB7C7-0B15-4592-927F-333761E9B727}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>XsltScenarios.Tests</AssemblyName> - <RootNamespace>System.Xml.Tests</RootNamespace> - <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -16,9 +10,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <!--<Reference Include="GotDotNet.Exslt.dll" />--> - </ItemGroup> - <ItemGroup> <!--<Compile Include="AspNet.cs" />--> <Compile Include="EXslt.cs" /> <Compile Include="Schematron.cs" /> @@ -42,7 +33,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="..\..\..\..\System.Private.Xml\pkg\System.Private.Xml.pkgproj" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="XsltScenarios.xml" /> 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 2c2cea4e99..43b1e8bf2a 100644 --- a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj +++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj @@ -1,23 +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>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AssemblyName>System.Reflection.Context.Tests</AssemblyName> - <RootNamespace>System.Reflection.Context.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="CustomReflectionContextTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.Context.pkgproj"> - <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> - <Name>System.Reflection.Context</Name> - <TargetGroup>netcore50</TargetGroup> - </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.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj index 2a9badce12..17a5642a4b 100644 --- a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj +++ b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj @@ -1,14 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{089444FE-8FF5-4D8F-A51B-32D026425F6B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.DispatchProxy.Tests</AssemblyName> - <RootNamespace>System.Reflection.DispatchProxy.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -19,11 +13,5 @@ <Compile Include="DispatchProxyTests.cs" /> <Compile Include="TestTypes.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.DispatchProxy.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Reflection.DispatchProxy</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 c2dc32d219..2500ca23de 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 @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.ILGeneration.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.ILGeneration.Tests</RootNamespace> <ProjectGuid>{FB037640-0591-4DF4-A331-0BEFE50A200B}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 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 040e29b534..cdeca4c833 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 @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.Lightweight.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.Lightweight.Tests</RootNamespace> <ProjectGuid>{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs b/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs index c22ea0e43a..ed4c9c6eb3 100644 --- a/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs +++ b/src/System.Reflection.Emit/tests/ConstructorBuilder/ConstructorBuilderSetCustomAttribute.cs @@ -49,7 +49,7 @@ namespace System.Reflection.Emit.Tests Type createdType = type.CreateTypeInfo().AsType(); ConstructorInfo createdConstructor = createdType.GetConstructor(new Type[0]); - Attribute[] customAttributes = createdConstructor.GetCustomAttributes(true).ToArray(); + Attribute[] customAttributes = (Attribute[])createdConstructor.GetCustomAttributes(true).ToArray(); Assert.Equal(1, customAttributes.Length); Assert.Equal(2, ((IntAllAttribute)customAttributes[0])._i); diff --git a/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs b/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs index dc88405e56..6313675a1d 100644 --- a/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs +++ b/src/System.Reflection.Emit/tests/EnumBuilder/EnumBuilder.Methods.Tests.cs @@ -215,7 +215,7 @@ namespace System.Reflection.Emit.Tests ConstructorInfo attributeConstructor = typeof(BoolAttribute).GetConstructor(new Type[] { typeof(bool) }); enumBuilder.SetCustomAttribute(attributeConstructor, new byte[] { 01, 00, 01 }); - Attribute[] objVals = enumBuilder.GetCustomAttributes(true).ToArray(); + Attribute[] objVals = (Attribute[])enumBuilder.GetCustomAttributes(true).ToArray(); Assert.Equal(new BoolAttribute(true), objVals[0]); } 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 5d70cdbf4a..00aedebc5e 100644 --- a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj +++ b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Emit.Tests</AssemblyName> - <RootNamespace>System.Reflection.Emit.Tests</RootNamespace> <ProjectGuid>{1104A263-331A-4CA0-B541-759BD20F7B1D}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Reflection.Emit/tests/Utilities.cs b/src/System.Reflection.Emit/tests/Utilities.cs index 656dd45ac5..23e78906c3 100644 --- a/src/System.Reflection.Emit/tests/Utilities.cs +++ b/src/System.Reflection.Emit/tests/Utilities.cs @@ -32,6 +32,14 @@ namespace System.Reflection.Emit.Tests public IntAllAttribute(int i) { _i = i; } } + public static class TypeExtensions + { + public static Type AsType(this Type type) + { + return type; + } + } + public static class Helpers { public const BindingFlags AllFlags = BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic; @@ -80,7 +88,7 @@ namespace System.Reflection.Emit.Tests Assert.Equal(size, type.Size); Assert.Equal(packingSize, type.PackingSize); - Assert.Equal(implementedInterfaces ?? new Type[0], type.ImplementedInterfaces); + Assert.Equal(implementedInterfaces ?? new Type[0], type.GetInterfaces()); if (declaringType == null && !type.IsInterface && (implementedInterfaces == null || implementedInterfaces.Length == 0)) { 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 574b9e503f..9f63709f85 100644 --- a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj +++ b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Extensions.Tests</AssemblyName> - <RootNamespace>System.Reflection.Extensions.Tests</RootNamespace> <ProjectGuid>{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 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 59a6e629e1..e3eaac233b 100644 --- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ExternallyShipping>false</ExternallyShipping> - <AssemblyName>System.Reflection.Metadata.Tests</AssemblyName> <RootNamespace>System.Reflection.Metadata.Tests</RootNamespace> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -142,9 +141,5 @@ <None Include="Resources\Misc\Signed.cs" /> <EmbeddedResource Include="Resources\Misc\Signed.exe" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\src\System.Reflection.Metadata.csproj" /> - <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.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.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj b/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj index ea43e2ad03..733f32b045 100644 --- a/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj +++ b/src/System.Reflection.TypeExtensions/tests/CoreCLR/System.Reflection.TypeExtensions.CoreCLR.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.TypeExtensions.CoreCLR.Tests</AssemblyName> - <RootNamespace>System.Reflection.TypeExtensions.CoreCLR.Tests</RootNamespace> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,9 +16,6 @@ </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Reflection.TypeExtensions.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="MemberInfoTests.CoreCLR.cs" /> <Compile Include="ModuleTests.CoreCLR.cs" /> </ItemGroup> 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 903fc6e297..5f43e9c5c5 100644 --- a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj +++ b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{089444FE-8FF5-4D8F-A51B-32D026425F6B}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.TypeExtensions.Tests</AssemblyName> - <RootNamespace>System.Reflection.TypeExtensions.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -29,11 +23,5 @@ <Compile Include="MethodBaseTests.cs" /> <Compile Include="ModuleTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.TypeExtensions.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Reflection.TypeExtensions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Reflection/tests/AssemblyTests.cs b/src/System.Reflection/tests/AssemblyTests.cs index af9d0502ac..7ce4e81f0c 100644 --- a/src/System.Reflection/tests/AssemblyTests.cs +++ b/src/System.Reflection/tests/AssemblyTests.cs @@ -191,7 +191,7 @@ namespace System.Reflection.Tests [Fact] public void Load_Invalid() { - Assert.Throws<ArgumentNullException>("assemblyRef", () => Assembly.Load(null)); // AssemblyRef is null + Assert.Throws<ArgumentNullException>("assemblyRef", () => Assembly.Load((AssemblyName)null)); // AssemblyRef is null Assert.Throws<FileNotFoundException>(() => Assembly.Load(new AssemblyName("no such assembly"))); // No such assembly } diff --git a/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj b/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj index dfd9862c89..635b770855 100644 --- a/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj +++ b/src/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj @@ -2,11 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.CoreCLR.Tests</AssemblyName> - <RootNamespace>System.Reflection.Tests</RootNamespace> <ProjectGuid>{C8049356-559D-4F34-AC17-56F3AE62C897}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -27,7 +22,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Reflection.pkgproj"/> <ProjectReference Include="..\TestExe\System.Reflection.Tests.TestExe.csproj"> <Project>{8c19b991-41e9-4b38-9602-e19375397f1d}</Project> <Name>System.Reflection.Tests.TestExe</Name> diff --git a/src/System.Reflection/tests/System.Reflection.Tests.csproj b/src/System.Reflection/tests/System.Reflection.Tests.csproj index 5e7f16c1f6..2dd14384a8 100644 --- a/src/System.Reflection/tests/System.Reflection.Tests.csproj +++ b/src/System.Reflection/tests/System.Reflection.Tests.csproj @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Reflection.Tests</AssemblyName> - <RootNamespace>System.Reflection.Tests</RootNamespace> <ProjectGuid>{B027C72E-F04E-42E0-A7F7-993AEF8400D2}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -42,10 +36,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Reflection.pkgproj"> - <Project>{446de6f0-47a0-4c2f-a918-768a76ccf461}</Project> - <Name>System.Reflection</Name> - </ProjectReference> <ProjectReference Include="TestExe\System.Reflection.Tests.TestExe.csproj"> <Project>{8c19b991-41e9-4b38-9602-e19375397f1d}</Project> <Name>System.Reflection.Tests.TestExe</Name> diff --git a/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj b/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj index d7f0989702..530638df71 100644 --- a/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj +++ b/src/System.Reflection/tests/TestExe/System.Reflection.Tests.TestExe.csproj @@ -4,10 +4,8 @@ <PropertyGroup> <ProjectGuid>{8C19B991-41E9-4B38-9602-E19375397F1D}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>System.Reflection.Tests</RootNamespace> - <AssemblyName>System.Reflection.Tests.TestExe</AssemblyName> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj index f08789a82f..0d84da2db5 100644 --- a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj +++ b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj @@ -1,15 +1,9 @@ -<?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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Resources.Reader.Tests</AssemblyName> - <RootNamespace>System.Resources.Reader.Tests</RootNamespace> <ProjectGuid>{8D7202E8-084A-4C20-AB93-3BF70D2E0651}</ProjectGuid> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -19,10 +13,5 @@ <ItemGroup> <Compile Include="ResourceReaderUnitTest.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Resources.Reader.pkgproj"> - <Name>System.Resources.Reader</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj index e95893a109..8ef1ea0ab2 100644 --- a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -2,11 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <OutputType>Library</OutputType> - <AssemblyName>System.Resources.ResourceManager.Tests</AssemblyName> - <RootNamespace>System.Resources.Tests</RootNamespace> <ProjectGuid>{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}</ProjectGuid> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == '' ">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -26,8 +22,8 @@ <Compile Include="$(CommonTestPath)/System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs"> <Link>System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs</Link> </Compile> - <Compile Include="MissingManifestResourceExceptionTests.netstandard17.cs"/> - <Compile Include="MissingSatelliteAssemblyException.cs"/> + <Compile Include="MissingManifestResourceExceptionTests.netstandard17.cs" /> + <Compile Include="MissingSatelliteAssemblyException.cs" /> <Compile Include="ResourceManagerTests.netstandard17.cs" /> <Compile Include="ResourceSetTests.cs" /> <EmbeddedResource Include="Resources\TestResx.netstandard17.resx"> @@ -41,13 +37,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="../pkg/System.Resources.ResourceManager.pkgproj"/> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="Resources\TestResx.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>TestResx.Designer.cs</LastGenOutput> </EmbeddedResource> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj index 0342e57145..cdcf09441d 100644 --- a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj +++ b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj @@ -1,15 +1,7 @@ -<?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" /> <Import Project="$(CommonTestPath)\Tests.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Resources.Writer.Tests</AssemblyName> - <RootNamespace>System.Resources.Writer.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup> @@ -18,14 +10,5 @@ <ItemGroup> <Compile Include="ResourceWriterUnitTest.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Resources.ResourceManager\pkg\System.Resources.ResourceManager.pkgproj"> - <Name>System.Resources.ResourceManager</Name> - </ProjectReference> - <ProjectReference Include="..\pkg\System.Resources.Writer.pkgproj"> - <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> - <Name>System.Resources.Writer</Name> - </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.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index 917f51d834..0d509d87c1 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 @@ -1,21 +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> - <RootNamespace>System.Runtime.CompilerServices</RootNamespace> - <AssemblyName>System.Runtime.CompilerServices.Unsafe.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Compile Include="UnsafeTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.CompilerServices.Unsafe.pkgproj"> - <Name>System.Runtime.CompilerServices.Unsafe</Name> - </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/Performance/System.Runtime.Extensions.Performance.Tests.csproj b/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj index 05ed848755..70835b0bec 100644 --- a/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Extensions.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Extensions.Performance.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -23,19 +17,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Runtime.Extensions.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime.Extensions.CoreCLR</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj" /> - <ProjectReference Include="..\..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <!-- ToDo: Remove these P2P references once packages are updated --> - <ProjectReference Include="..\..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <ProjectReference Include="..\..\..\System.Collections.NonGeneric\pkg\System.Collections.NonGeneric.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 d817db43f8..8173f0c8f1 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}</ProjectGuid> @@ -43,9 +40,6 @@ </Compile> <Compile Include="System\Reflection\AssemblyNameProxyTests.cs" /> <Compile Include="System\MarshalByRefObjectTest.cs" /> - <!-- ToDo: Remove these P2P references once packages are updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\pkg\System.Collections.NonGeneric.pkgproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> <Compile Include="System\BitConverter.netcoreapp1.1.cs" /> diff --git a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj index 3c6a0d3c28..ccd1114092 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj +++ b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj @@ -5,7 +5,6 @@ <ProjectGuid>{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}</ProjectGuid> <OutputType>Exe</OutputType> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> <IsTestProject>true</IsTestProject> <NoWarn>0436</NoWarn> </PropertyGroup> diff --git a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj index b9b57177e7..a681f349c8 100644 --- a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj +++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj @@ -1,12 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <ProjectGuid>{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -14,11 +10,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.Handles.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="CriticalHandle.cs" /> <Compile Include="SafeHandle.cs" /> <Compile Include="SafeWaitHandle.cs" /> 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 2ddb4021aa..0abfd2549c 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,19 +1,9 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.InteropServices.RuntimeInformation.Tests</RootNamespace> - <AssemblyName>System.Runtime.InteropServices.RuntimeInformation.Tests</AssemblyName> <ProjectGuid>{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -21,15 +11,9 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.InteropServices.RuntimeInformation.pkgproj"> - <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> - <Name>System.Runtime.InteropServices.RuntimeInformation</Name> - </ProjectReference> - </ItemGroup> - <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/tests/System.Runtime.InteropServices.Tests.csproj b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj index 97745e8a2f..fbe4bd9f0f 100644 --- a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj +++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj @@ -1,14 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <RootNamespace>System.Runtime.InteropServices</RootNamespace> - <AssemblyName>System.Runtime.InteropServices.Tests</AssemblyName> <ProjectGuid>{A824F4CD-935B-4496-A1B2-C3664936DA7B}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -17,10 +11,10 @@ <Compile Include="System\Runtime\InteropServices\DefaultParameterValueAttributeTests.cs" /> <Compile Include="System\Runtime\InteropServices\HandleCollectorTests.cs" /> <Compile Include="System\Runtime\InteropServices\MarshalTests.cs" /> - <!-- Helpers --> + <!-- Helpers --> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>Common\System\PlatformDetection.cs</Link> - </Compile> + </Compile> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="System\Runtime\InteropServices\RuntimeEnvironmentTest.netstandard1.7.cs" /> @@ -47,8 +41,5 @@ <Link>System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Runtime.InteropServices.pkgproj" /> - </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/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj index 03186a37bd..40bd38e10a 100644 --- a/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj +++ b/src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj @@ -3,10 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.DefaultContext.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.DefaultContext.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="DefaultLoadContextTest.cs" /> diff --git a/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj b/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj index 2f59e143df..c1eab146e4 100644 --- a/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj +++ b/src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.RefEmitLoadContext.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.RefEmitLoadContext.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}</ProjectGuid> </PropertyGroup> <ItemGroup> diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj index 7d0087b36e..0353b91c2d 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj @@ -2,13 +2,11 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.Noop.Assembly</RootNamespace> - <AssemblyName>System.Runtime.Loader.Noop.Assembly</AssemblyName> <ProjectGuid>{396D6EBF-60BD-4DAF-8783-FB403E070A57}</ProjectGuid> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> <!-- Test expects an un-signed assembly --> <SkipSigning>true</SkipSigning> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <ItemGroup> <Compile Include="TestClass.cs" /> 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 8b4ea6a945..5944e7bb2b 100644 --- a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj +++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj @@ -2,14 +2,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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Loader.Tests</RootNamespace> - <AssemblyName>System.Runtime.Loader.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyLoadContextTest.cs" /> @@ -23,4 +17,4 @@ <EmbeddedResource Include="System.Runtime.Loader.Test.Assembly.dll" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - </Project>
\ No newline at end of file +</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 8be1b575bc..806e70db52 100644 --- a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj +++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.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> diff --git a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index 0102f2a5de..7bfdda2941 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -1,14 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7C70BB15-870B-4946-8098-625DACD645A6}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Runtime.Serialization.Formatters.Tests</AssemblyName> - <RootNamespace>System.Runtime.Serialization.Formatters.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> + <SkipIncludeNewtonsoftJson>true</SkipIncludeNewtonsoftJson> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -41,11 +36,6 @@ <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Runtime.Serialization.Formatters.pkgproj"> - <Project>{ca488507-3b6e-4494-b7be-7b4eeeb2c4d1}</Project> - <Name>System.Runtime.Serialization.Formatters</Name> - <Private>True</Private> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj index 29deaa9d2c..aba111dc51 100644 --- a/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj @@ -1,17 +1,8 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Serialization.Json.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.Performance.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> - <KeepAllProjectReferences>true</KeepAllProjectReferences> - </PropertyGroup> - <PropertyGroup Condition="'$(UseContractReferences)' == 'true'" > - <ProjectJson>ContractReferences/project.json</ProjectJson> - <ProjectLockJson>ContractReferences/project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> @@ -21,13 +12,8 @@ <Compile Include="DcjsPerformanceTest.cs" /> <Compile Include="JsonNetPerformanceTest.cs" /> </ItemGroup> - <ItemGroup Condition="'$(UseContractReferences)' == ''" > - <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Xml\src\System.Runtime.Serialization.Xml.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Json\src\System.Runtime.Serialization.Json.csproj" /> - </ItemGroup> <ItemGroup> <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.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj index feb3ebac35..5e70da7486 100644 --- a/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj @@ -3,11 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants> - <RootNamespace>System.Runtime.Serialization.Json.ReflectionOnly.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.ReflectionOnly.Tests</AssemblyName> <ProjectGuid>{C99A835E-46F3-4C05-AD34-7DD84FB7466B}</ProjectGuid> - <ProjectJson>../project.json</ProjectJson> - <ProjectLockJson>../project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="$(TestSourceFolder)..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> @@ -16,5 +12,5 @@ <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" /> <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.CoreCLR.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Json.Tests.settings.targets))\System.Runtime.Serialization.Json.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj index 8f57ca026a..52ea140015 100644 --- a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj @@ -2,8 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Serialization.Json.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Json.Tests</AssemblyName> <ProjectGuid>{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}</ProjectGuid> </PropertyGroup> <ItemGroup> @@ -13,5 +11,5 @@ <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" /> <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.CoreCLR.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Json.Tests.settings.targets))\System.Runtime.Serialization.Json.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj index 6174204346..a296a9a0c0 100644 --- a/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Runtime.Serialization.Xml.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition="'$(UseContractReferences)' == 'true'" > - <ProjectJson>ContractReferences/project.json</ProjectJson> - <ProjectLockJson>ContractReferences/project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="..\Utils.cs" /> @@ -24,9 +16,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(UseContractReferences)' == ''"> - <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - <ProjectReference Include="..\..\..\System.Runtime.Serialization.Xml\src\System.Runtime.Serialization.Xml.csproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj index d0ef365d52..7f10144b0a 100644 --- a/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj @@ -3,11 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants> - <RootNamespace>System.Runtime.Serialization.Xml.ReflectionOnly.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.ReflectionOnly.Tests</AssemblyName> <ProjectGuid>{38889701-0af4-48b3-999c-e99d639c61b6}</ProjectGuid> - <ProjectJson>../project.json</ProjectJson> - <ProjectLockJson>../project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> <Compile Include="$(TestSourceFolder)Utils.cs" /> @@ -21,5 +17,5 @@ <Compile Include="$(TestSourceFolder)XmlDictionaryReaderTests.cs" /> <Compile Include="$(TestSourceFolder)XmlDictionaryWriterTest.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Xml.Tests.settings.targets))\System.Runtime.Serialization.Xml.Tests.settings.targets" /> -</Project> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index 3bb8bba736..b2d8f72751 100644 --- a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -2,8 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Serialization.Xml.Tests</RootNamespace> - <AssemblyName>System.Runtime.Serialization.Xml.Tests</AssemblyName> <ProjectGuid>{30CAB353-089E-4294-B23B-F2DD1D945654}</ProjectGuid> </PropertyGroup> <ItemGroup> @@ -18,5 +16,5 @@ <Compile Include="$(TestSourceFolder)XmlDictionaryReaderTests.cs" /> <Compile Include="$(TestSourceFolder)XmlDictionaryWriterTest.cs" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), System.Runtime.Serialization.Xml.Tests.settings.targets))\System.Runtime.Serialization.Xml.Tests.settings.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj b/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj index 066e1451bf..d092c563ce 100644 --- a/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj +++ b/src/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj @@ -1,13 +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"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.Runtime.Performance.Tests</RootNamespace> - <AssemblyName>System.Runtime.Performance.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>1718</NoWarn> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -32,13 +29,5 @@ <Link>Common\System\PerfUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.Runtime.pkgproj"> - <Project>{1e689c1b-690c-4799-bde9-6e7990585894}</Project> - <Name>System.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj"> - </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/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj index 5ecfe905fe..42a3cbf166 100644 --- a/src/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/System.Runtime/tests/System.Runtime.Tests.csproj @@ -2,15 +2,9 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Runtime.Tests</RootNamespace> - <AssemblyName>System.Runtime.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>1718</NoWarn> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -222,22 +216,6 @@ <Project>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</Project> <Name>TestLoadAssembly</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Runtime.pkgproj"> - <Project>{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}</Project> - <Name>System.Runtime</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Private.Uri\pkg\System.Private.Uri.pkgproj"> - <Project>{4AC5343E-6E31-4BA5-A795-0493AE7E9008}</Project> - <Name>System.Private.Uri</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Collections.NonGeneric\pkg\System.Collections.NonGeneric.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj index 470702c4c9..605a2b1218 100644 --- a/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj +++ b/src/System.Runtime/tests/TestAssembly/TestAssembly.csproj @@ -3,11 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>TestAssembly</RootNamespace> - <AssemblyName>TestAssembly</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj index e22d772258..26b4701a44 100644 --- a/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj +++ b/src/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj @@ -3,12 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>TestLoadAssembly</RootNamespace> - <AssemblyName>TestLoadAssembly</AssemblyName> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <CopyNuGetImplementations>false</CopyNuGetImplementations> <AssemblyVersion>1.0.0.0</AssemblyVersion> + <IsTestProject>true</IsTestProject> + <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> diff --git a/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj index 7a8d7bd143..f0e5e748a2 100644 --- a/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj +++ b/src/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj @@ -1,17 +1,9 @@ -<?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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <ProjectGuid>{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.AccessControl.Tests</AssemblyName> <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -21,16 +13,6 @@ <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.AccessControl.pkgproj"> - <Project>{879c23dc-d828-4dfb-8e92-abbc11b71035}</Project> - <Name>System.Security.AccessControl</Name> - <Private>True</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="Ace\Ace.Common.Tests.cs" /> <Compile Include="Ace\Ace.Compound.Tests.cs" /> <Compile Include="Ace\Ace.Custom.Tests.cs" /> @@ -96,4 +78,4 @@ <Compile Include="Utils.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.Claims/tests/System.Security.Claims.Tests.csproj b/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj index 29c7059053..b87750426d 100644 --- a/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj +++ b/src/System.Security.Claims/tests/System.Security.Claims.Tests.csproj @@ -1,11 +1,8 @@ -<?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>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <AssemblyName>System.Security.Claims.Tests</AssemblyName> - <RootNamespace>System.Security.Claims.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -15,10 +12,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Claims.pkgproj"> - <Name>System.Security.Claims</Name> - </ProjectReference> - </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/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index d5b48dcb8c..8c46da0eca 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 @@ -1,33 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Algorithms.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Algorithms.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Algorithms.pkgproj"> - <Project>{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}</Project> - <Name>System.Security.Cryptography.Algorithms</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>CommonTest\System\PlatformDetection.cs</Link> </Compile> @@ -226,11 +204,5 @@ <ItemGroup> <Folder Include="Common\Interop\Unix\" /> </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove once prerelease gets updated again --> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj"> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> - </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.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index e971621798..647d577536 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,40 +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"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_NT_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{FF53459F-66F7-4F00-8D36-DF440CE18419}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Cng.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Cng.Tests</RootNamespace> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Cng.pkgproj"> - <Project>{4c1bd451-6a99-45e7-9339-79c77c42ee9e}</Project> - <Name>System.Security.Cryptography.Cng</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\pkg\System.Security.Cryptography.Algorithms.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="CreateTests.cs" /> <Compile Include="HandleTests.cs" /> <Compile Include="OpenTests.cs" /> @@ -85,6 +59,9 @@ </Compile> </ItemGroup> <ItemGroup> + <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> + <Link>CommonTest\System\PlatformDetection.cs</Link> + </Compile> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> 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 58f29339ce..7d78c0081a 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,39 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_NT_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{A05C2EF2-A986-448C-9C63-735CC17409AA}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Csp.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Csp.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Csp.pkgproj"> - <Project>{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}</Project> - <Name>System.Security.Cryptography.Csp</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\pkg\System.Security.Cryptography.Primitives.pkgproj"/> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\pkg\System.Security.Cryptography.Algorithms.pkgproj"/> - </ItemGroup> - <ItemGroup> <Compile Include="CspParametersTests.cs" /> <Compile Include="ImportExportCspBlob.cs" /> <Compile Include="RSACryptoServiceProviderBackCompat.cs" /> @@ -134,4 +108,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.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index d6f7aa0492..9a55c299a5 100644 --- a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -1,35 +1,12 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{0581E9FA-D639-4B88-96D8-D092760F90B0}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Encoding.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Encoding.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Encoding.pkgproj"> - <Project>{AA81E343-5E54-40B0-9381-C459419BE780}</Project> - <Name>System.Security.Cryptography.Encoding</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="AsnEncodedData.cs" /> <Compile Include="AsnEncodedDataCollectionTests.cs" /> <Compile Include="DerEncoderTests.cs" /> 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 f90fc3e4f7..83c00812b5 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 @@ -1,16 +1,8 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Unix_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{A05C2EF2-A986-448C-9C63-735CC17409AA}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.OpenSsl.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.OpenSsl.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" /> @@ -117,17 +109,5 @@ <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.OpenSsl.pkgproj"> - <Project>{78452f3e-ba91-47e7-bb0f-02e8a5c116c4}</Project> - <Name>System.Security.Cryptography.OpenSsl</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <!-- ToDo: Remove once prerelease gets updated again --> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\pkg\System.Security.Cryptography.Algorithms.pkgproj"> - <Name>System.Security.Cryptography.Algorithms</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 a5db79b79d..d576566bd2 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,20 +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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Pkcs.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Pkcs.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> </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)' == 'Windows_Debug|AnyCPU'" /> @@ -23,20 +14,11 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" /> - - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Pkcs.pkgproj"> - <Project>{03D84CBD-896D-4B2F-9A22-07034F51E73D}</Project> - <Name>System.Security.Cryptography.Pkcs</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup> <Compile Include="Certificates.cs" /> <Compile Include="CertLoader.cs" /> @@ -56,10 +38,8 @@ <Compile Include="Pkcs9AttributeTests.cs" /> <Compile Include="RecipientInfoCollectionTests.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> - <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> + <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/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 9ff5dc61b4..9376d7d4b7 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 @@ -1,25 +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" /> <Import Project="$(CommonTestPath)\Tests.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{101EB757-55A4-4F48-841C-C088640B8F57}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.Primitives.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.Primitives.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11;netstandard17</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.Primitives.pkgproj"> - <Project>{D04A73AE-E418-4ACD-A132-7688435BE8B5}</Project> - <Name>System.Security.Cryptography.Primitives</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="AsymmetricAlgorithm\Trivial.cs" /> <Compile Include="CryptoStream.cs" /> <Compile Include="HmacAlgorithmTest.cs" /> @@ -34,18 +22,8 @@ <Link>CommonTest\System\IO\PositionValueStream.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> + <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'"> <Compile Include="CryptoConfigTests.cs" /> </ItemGroup> - <ItemGroup> - <!-- TODO: Remove this when the package reference is ready --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - </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.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index 6c3d82d638..c6151f5383 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 @@ -1,29 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <CLRTestKind>BuildAndRun</CLRTestKind> <ProjectGuid>{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.ProtectedData.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.ProtectedData.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.ProtectedData.pkgproj"> - <Project>{FB39F994-1504-4B96-9588-E0385D3B73F1}</Project> - <Name>System.Security.Cryptography.ProtectedData</Name> - </ProjectReference> - </ItemGroup> - - <ItemGroup> <Compile Include="ProtectedDataTests.cs" /> <Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs"> <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </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.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index e19515a2eb..a96d95ea86 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -1,18 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Cryptography.X509Certificates.Tests</AssemblyName> - <RootNamespace>System.Security.Cryptography.X509Certificates.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netcoreapp1.1'">$(DefineConstants);netstandard17;netcoreapp11</DefineConstants> </PropertyGroup> @@ -21,20 +12,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Cryptography.X509Certificates.pkgproj"> - <Project>{6f8576c2-6cd0-4df3-8394-00b002d82e40}</Project> - <Name>System.Security.Cryptography.X509Certificates</Name> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Security.Permissions\pkg\System.Security.Permissions.pkgproj" /> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="Cert.cs" /> <Compile Include="CertTests.cs" /> <Compile Include="ChainHolder.cs" /> @@ -95,4 +72,4 @@ <SupplementalTestData Include="$(PackagesDir)System.Security.Cryptography.X509Certificates.TestData\1.0.2-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.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index a0ce7dc380..cc52d7f960 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -2,28 +2,12 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Security.Permissions.Tests</RootNamespace> - <AssemblyName>System.Security.Permissions.Tests</AssemblyName> <ProjectGuid>{492EC54D-D2C4-4B3F-AC1F-646B3F7EBB02}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Permissions.pkgproj"> - <Name>System.Security.Permissions</Name> - </ProjectReference> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\System.Runtime.Extensions\pkg\System.Runtime.Extensions.pkgproj" /> - <!-- Do not remove this P2P reference since part of the implementation of NonGeneric has moved to Runtime.Extensions --> - <ProjectReference Include="..\..\System.IO\pkg\System.IO.pkgproj" /> - <!-- ToDo: Remove this P2P reference once packages are updated --> - <ProjectReference Include="..\..\System.Collections.NonGeneric\pkg\System.Collections.NonGeneric.pkgproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == ''"> <Compile Include="PrincipalPermissionTests.cs" /> <Compile Include="SecurityElementTests.cs" /> diff --git a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index 18cfa4590e..99643a605a 100644 --- a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -1,17 +1,8 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Security.Principal.Windows.Tests</AssemblyName> - <RootNamespace>System.Security.Principal.Windows.Tests</RootNamespace> <ProjectGuid>{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="WindowsIdentityTests.cs" /> @@ -20,11 +11,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.Principal.Windows.pkgproj"> - <Project>{f9e9894e-2513-4085-9046-311ad49d8ae6}</Project> - <Name>System.Security.Principal.Windows</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</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 a4c8e0a525..5d5b83e2b2 100644 --- a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj +++ b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj @@ -1,18 +1,9 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{69609238-62C7-479D-A8CE-709F41101D3C}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>System.Security.SecureString.Tests</RootNamespace> - <AssemblyName>System.Security.SecureString.Tests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -20,13 +11,5 @@ <ItemGroup> <Compile Include="SecureStringTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Security.SecureString.pkgproj"> - <Project>{A958BBDD-3238-4E58-AB7F-390AB6D88233}</Project> - <Name>System.Security.SecureString</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj index 60533caf5a..3f4a2bb595 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.csproj @@ -1,14 +1,8 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RootNamespace>System.ServiceProcess.ServiceController.Tests</RootNamespace> - <AssemblyName>System.ServiceProcess.ServiceController.Tests</AssemblyName> <ProjectGuid>{F7D9984B-02EB-4573-84EF-00FFFBFB872C}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> @@ -17,12 +11,6 @@ <Compile Include="SafeServiceControllerTests.cs" /> <Compile Include="ServiceControllerTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\pkg\System.ServiceProcess.ServiceController.pkgproj"> - <Project>{f4821cb6-91a3-4546-bc4f-e00dbfbdaa05}</Project> - <Name>System.ServiceProcess.ServiceController</Name> - </ProjectReference> - </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)'=='true' AND '$(Platform)'!='arm64'"> <ProjectReference Include="..\System.ServiceProcess.ServiceController.TestNativeService\System.ServiceProcess.ServiceController.TestNativeService.vcxproj"> <Project>{ceb0775c-4273-4ac4-b50e-4492718051ae}</Project> @@ -33,4 +21,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.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index 11c1b7e364..68ad04ccd4 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 @@ -1,14 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.CodePages.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.CodePages.Tests</RootNamespace> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> @@ -22,11 +16,5 @@ <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.Encoding.CodePages.pkgproj"> - <Project>{16EE6633-F557-5C9E-9EF3-B5334B044F47}</Project> - <Name>System.Text.Encoding.CodePages</Name> - </ProjectReference> - </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.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj index 10e0c55c77..33c117b9c5 100644 --- a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj +++ b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.Extensions.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Extensions.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj b/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj index 72404c6b82..03e7ee7120 100644 --- a/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj +++ b/src/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj @@ -1,12 +1,9 @@ -<?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> - <AssemblyName>System.Text.Encoding.Performance.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Performance.Tests</RootNamespace> <IncludePerformanceTests>true</IncludePerformanceTests> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> diff --git a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj index 50acec3fdb..d3b2c9e31d 100644 --- a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj +++ b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Text.Encoding.Tests</AssemblyName> - <RootNamespace>System.Text.Encoding.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -85,13 +79,5 @@ <Compile Include="Decoder\Decoder.netstandard1.7.cs" /> <Compile Include="Encoder\Encoder.netstandard1.7.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Text.Encoding.Extensions\pkg\System.Text.Encoding.Extensions.pkgproj"> - <Name>System.Text.Encoding.Extensions</Name> - </ProjectReference> - <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj"> - <Name>System.Runtime</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 b6801a12bd..a7116b66cd 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 @@ -1,21 +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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <AssemblyName>System.Text.Encodings.Web.Tests</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Text.Encodings.Web.Tests</RootNamespace> <FileAlignment>512</FileAlignment> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <ItemGroup> @@ -49,17 +42,8 @@ <Compile Include="UrlEncoderTests.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.Encodings.Web.pkgproj"> - <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> - <Name>System.Text.Encodings.Web</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="$(CommonTestPath)\Data\UnicodeData.8.0.txt"> - <LogicalName>UnicodeData.8.0.txt</LogicalName> + <LogicalName>UnicodeData.8.0.txt</LogicalName> </EmbeddedResource> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index 41da08ed20..fb97d1b25b 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -1,15 +1,9 @@ -<?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> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{94B106C2-D574-4392-80AB-3EE308A078DF}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>System.Text.RegularExpressions.Tests</AssemblyName> - <NugetTargetMoniker Condition=" '$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' "> @@ -48,16 +42,6 @@ <Link>System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Text.RegularExpressions.pkgproj"> - <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> - <Name>System.Text.RegularExpressions</Name> - </ProjectReference> - </ItemGroup> <!-- Automatically added by VS --> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 c5881026e5..b2e9b5766f 100644 --- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -1,23 +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>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> - <AssemblyName>System.Threading.AccessControl.Tests</AssemblyName> - <RootNamespace>System.Threading.AccessControl.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="MutexSecurityTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.AccessControl.pkgproj"> - <Project>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</Project> - <Name>System.Threading.AccessControl</Name> - <OSGroup>$(InputOSGroup)</OSGroup> - </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.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj index 04ab24b66a..5a1b4761fb 100644 --- a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj +++ b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj @@ -1,17 +1,9 @@ -<?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> - <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Overlapped.Tests</AssemblyName> <ProjectGuid>{861A3318-35AD-46ac-8257-8D5D2479BAD9}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -34,9 +26,5 @@ <ItemGroup Condition="'$(TargetGroup)'==''"> <Compile Include="OverlappedTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Overlapped.pkgproj" /> - <ProjectReference Include="..\..\System.Threading.ThreadPool\pkg\System.Threading.ThreadPool.pkgproj" /> - </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.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index 9ae53752c9..f1714949b4 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,8 @@ -<?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> - <RootNamespace>System.Threading.Tasks.Dataflow.Tests</RootNamespace> - <AssemblyName>System.Threading.Tasks.Dataflow.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -25,17 +22,10 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Dataflow.pkgproj"> - <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> - <Name>System.Threading.Tasks.Dataflow</Name> - </ProjectReference> <ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 f4c6a3f846..c245b4910e 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 @@ -2,13 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Tasks.Extensions.Tests</AssemblyName> - <RootNamespace>System.Threading.Tasks.Extensions.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> @@ -17,11 +11,5 @@ <Compile Include="AsyncValueTaskMethodBuilderTests.cs" /> <Compile Include="ValueTaskTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Extensions.pkgproj"> - <Project>{F24D3391-2928-4E83-AADE-B34423498750}</Project> - <Name>System.Threading.Tasks.Extensions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 df80ef8b98..439f932a8b 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,15 +1,9 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}</ProjectGuid> - <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>System.Threading.Tasks.Parallel.Tests</RootNamespace> - <AssemblyName>System.Threading.Tasks.Parallel.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup> @@ -41,12 +35,5 @@ <Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Tasks.Parallel.pkgproj"> - <Project>{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}</Project> - <Name>System.Threading.Tasks.Parallel</Name> - <Private>true</Private> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj index 3df8871feb..c675b8431e 100644 --- a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -1,20 +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> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Tasks.Tests</AssemblyName> <ProjectGuid>{B6C09633-D161-499A-8FE1-46B2D53A16E7}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> - <ProjectReference Include="..\pkg\System.Threading.Tasks.pkgproj" /> - </ItemGroup> - <ItemGroup> <Compile Include="XunitAssemblyAttributes.cs" /> <Compile Include="UnwrapTests.cs" /> <Compile Include="AggregateExceptionTests.cs" /> diff --git a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj index c2ed22dd5b..b8b13e49a5 100644 --- a/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj +++ b/src/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj @@ -1,13 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Thread.Tests</AssemblyName> <ProjectGuid>{33F5A50E-B823-4FDD-8571-365C909ACEAE}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -28,12 +23,5 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Thread.pkgproj"> - <OSGroup>$(InputOSGroup)</OSGroup> - </ProjectReference> - <!-- ToDo: Remove this P2P reference once new packages are produced and updated --> - <ProjectReference Include="..\..\System.Runtime.InteropServices\pkg\System.Runtime.InteropServices.pkgproj" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj index 39f7984b09..1d1b8b0156 100644 --- a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj +++ b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj @@ -1,13 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.ThreadPool.Tests</AssemblyName> <ProjectGuid>{403AD1B8-6F95-4A2E-92A2-727606ABD866}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,8 +17,5 @@ <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.ThreadPool.pkgproj"/> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj index 3512818d4c..b83e1197e7 100644 --- a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj +++ b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Timer.Tests</AssemblyName> <ProjectGuid>{ac20a28f-fda8-45e8-8728-058ead16e44c}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,8 +17,5 @@ <Compile Include="TimerChangeTests.netstandard1.7.cs" /> <Compile Include="TimerFiringTests.netstandard1.7.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Threading.Timer.pkgproj"/> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj b/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj index 20b418a8a8..a7b3f9e55d 100644 --- a/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj +++ b/src/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj @@ -1,10 +1,8 @@ -<?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> - <AssemblyName>System.Threading.Performance.Tests</AssemblyName> <IncludePerformanceTests>true</IncludePerformanceTests> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -22,7 +20,6 @@ <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> - <ProjectReference Include="..\..\pkg\System.Threading.pkgproj"/> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading/tests/System.Threading.Tests.csproj b/src/System.Threading/tests/System.Threading.Tests.csproj index 551183027b..6012de2503 100644 --- a/src/System.Threading/tests/System.Threading.Tests.csproj +++ b/src/System.Threading/tests/System.Threading.Tests.csproj @@ -1,13 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <OutputType>Library</OutputType> - <AssemblyName>System.Threading.Tests</AssemblyName> <ProjectGuid>{33F5A50E-B823-4FDD-8571-365C909ACEAE}</ProjectGuid> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> @@ -67,8 +62,6 @@ <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>RemoteExecutorConsoleApp</Name> </ProjectReference> - <ProjectReference Include="..\pkg\System.Threading.pkgproj"/> - <ProjectReference Include="..\..\System.Diagnostics.Debug\pkg\System.Diagnostics.Debug.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Transactions/tests/System.Transactions.Tests.csproj b/src/System.Transactions/tests/System.Transactions.Tests.csproj index 9f0f44e8e5..935eeca3ad 100644 --- a/src/System.Transactions/tests/System.Transactions.Tests.csproj +++ b/src/System.Transactions/tests/System.Transactions.Tests.csproj @@ -1,13 +1,8 @@ -<?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> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.Transactions.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="NonMsdtcPromoterTests.cs" /> @@ -21,10 +16,5 @@ <Compile Include="HelperFunctions.cs" /> <Compile Include="TestEnlistments.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.Transactions.pkgproj"> - <Name>System.Transactions</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </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 9c5cc183f2..66c44601c8 100644 --- a/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj +++ b/src/System.ValueTuple/tests/System.ValueTuple.Tests.csproj @@ -2,12 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>System.ValueTuple.Tests</AssemblyName> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <LangVersion>5</LangVersion> @@ -17,11 +12,5 @@ <Compile Include="ExtensionsTests.cs" /> <Compile Include="ValueTupleTests.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\pkg\System.ValueTuple.pkgproj"> - <Name>System.ValueTuple</Name> - <Project>{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}</Project> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj index 557e54665b..fd6cc1b654 100644 --- a/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj +++ b/src/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj @@ -1,10 +1,6 @@ -<?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> - <OutputType>Library</OutputType> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.3_Debug|AnyCPU' "> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.3_Release|AnyCPU' "> @@ -13,13 +9,7 @@ <Compile Include="HttpUtility\HttpUtilityTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\pkg\System.Web.HttpUtility.pkgproj"> - <Name>System.Web.HttpUtility</Name> - <Project>{53D09AF4-0C13-4197-B8AD-9746F0374E88}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |