Skip to content

Use .NET SDK in two test projects #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2022
Merged

Use .NET SDK in two test projects #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c01cbed
Use .NET SDK in NetCore.Test project
dougbu Nov 13, 2022
8ee67e0
Use .NET SDK in Microsoft.TestCommon
dougbu Aug 7, 2022
82f520b
Create general `TestAssembly` target
dougbu Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions Runtime.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,30 @@
<Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames">
<ItemGroup>
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" />
<_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.*.dll" />
<_TestDLLsXunit Include="bin\$(Configuration)\Test\NetCore\*.Test.dll" Condition="'$(BuildPortable)' == 'true'" />
<_XunitProject Include="tools\WebStack.xunit.targets">
<Properties>TestAssembly=%(_TestDLLsXunit.FullPath);XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
<_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll"
Condition=" '$(BuildPortable)' == 'true' " />
<_XunitProject Include="tools\WebStack.testing.targets">
<Properties>TestAssembly=%(_TestDLLsXunit.FullPath);
XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
</_XunitProject>

<_VSTestDLLs Include="bin\$(Configuration)\test\*\netcoreapp*\*.Test.dll"
Condition=" '$(BuildPortable)' == 'true' "/>
<_XunitProject Include="tools\WebStack.testing.targets"
Condition=" '$(BuildPortable)' == 'true' ">
<Properties>TestAssembly=%(_VSTestDLLs.FullPath);
XmlPath=$(TestResultsDirectory)%(_VSTestDLLs.FileName)-NetCoreApp-XunitResults.xml;
UseVSTest=true</Properties>
</_XunitProject>
</ItemGroup>

<!-- Recreate the test results directory so that print summary doesn't run on old test results. -->
<RemoveDir Directories="$(TestResultsDirectory)" />
<MakeDir Directories="$(TestResultsDirectory)" />

<MSBuild Projects="@(_XunitProject)" BuildInParallel="$(TestInParallel)" Targets="Xunit">
<MSBuild Projects="@(_XunitProject)" BuildInParallel="$(TestInParallel)" Targets="TestAssembly">
<Output TaskParameter="TargetOutputs" ItemName="_ExitCodes" />
</MSBuild>

<!-- Failures in this project will fail build. But, results will not be included in test run summary. -->
<MSBuild
Properties="Configuration=$(Configuration)"
Projects="test\System.Net.Http.Formatting.NetStandard.Test\System.Net.Http.Formatting.NetStandard.Test.csproj"
Targets="Test"
Condition="'$(BuildPortable)' == 'true'" />
</Target>

<Target Name="CheckSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">
Expand Down
4 changes: 2 additions & 2 deletions RuntimePortable.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A9836F9E-6DB
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C40883CD-366D-4534-8B58-3EA0D13136DF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Formatting.NetCore", "src\System.Net.Http.Formatting.NetCore\System.Net.Http.Formatting.NetCore.csproj", "{C7060639-719B-4BD2-8A37-2F146B5A0668}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Formatting.NetCore.Test", "test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj", "{8DA61DAC-FF7E-4CA1-93A0-6148DB66FD08}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetCore.Test", "test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj", "{8DA61DAC-FF7E-4CA1-93A0-6148DB66FD08}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetStandard", "src\System.Net.Http.Formatting.NetStandard\System.Net.Http.Formatting.NetStandard.csproj", "{636CA76A-C85C-42E2-B4AA-88046279B3CA}"
EndProject
Expand Down
2 changes: 0 additions & 2 deletions packages/repositories.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
<repository path="..\src\WebApiHelpPage\packages.config" />
<repository path="..\src\WebApiHelpPage\VB\packages.config" />
<repository path="..\test\Microsoft.AspNet.Facebook.Test\packages.config" />
<repository path="..\test\Microsoft.TestCommon\packages.config" />
<repository path="..\test\Microsoft.Web.Helpers.Test\packages.config" />
<repository path="..\test\Microsoft.Web.Mvc.Test\packages.config" />
<repository path="..\test\Microsoft.Web.WebPages.OAuth.Test\packages.config" />
<repository path="..\test\System.Net.Http.Formatting.NetCore.Test\packages.config" />
<repository path="..\test\System.Net.Http.Formatting.Test\packages.config" />
<repository path="..\test\System.Web.Cors.Test\packages.config" />
<repository path="..\test\System.Web.Helpers.Test\packages.config" />
Expand Down
5 changes: 4 additions & 1 deletion test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<TargetFrameworkVersion Condition="'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test'">v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion
Condition=" '$(MSBuildProjectName)' != 'Microsoft.TestCommon' AND
'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetCore.Test' AND
'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test' ">v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion test/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<Import Project="..\packages\xunit.runner.msbuild.2.3.1\**\xunit.runner.msbuild.props" />
<Import Project="..\packages\xunit.runner.msbuild.2.3.1\**\xunit.runner.msbuild.props"
Condition="$(IsTestProject) and '$(MSBuildRuntimeType)' != 'Core' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" />

<Target Name="Test" DependsOnTargets="_TestWithVSTest;_TestWithDotnetTest;_TestWithRunner" />

Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.TestCommon/ExceptionAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ public static ArgumentOutOfRangeException ThrowsArgumentLessThanOrEqualTo(Action
String.Format(CultureReplacer.DefaultCulture, "Value must be less than or equal to {0}.", maxValue), false, actualValue);
}

#if !NETCOREAPP
/// <summary>
/// Verifies that the code throws an HttpException (or optionally any exception which derives from it).
/// </summary>
Expand All @@ -481,6 +482,7 @@ public static HttpException ThrowsHttpException(Action testCode, string exceptio
Equal(httpCode, ex.GetHttpCode());
return ex;
}
#endif

/// <summary>
/// Verifies that the code throws an InvalidEnumArgumentException (or optionally any exception which derives from it).
Expand Down
139 changes: 17 additions & 122 deletions test/Microsoft.TestCommon/Microsoft.TestCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
<PropertyGroup>
<ProjectGuid>{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.TestCommon</RootNamespace>
<AssemblyName>Microsoft.TestCommon</AssemblyName>
<IsTestProject>false</IsTestProject>
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
<OutputPath>..\..\bin\$(Configuration)\Test\</OutputPath>
<CodeSignEnabled>false</CodeSignEnabled>
<EnableGetGitHeadSHA1>false</EnableGetGitHeadSHA1>
<ValidateBuildParamsDisabled>true</ValidateBuildParamsDisabled>
<VersionFileGenerationEnabled>false</VersionFileGenerationEnabled>
<Configurations>$(Configurations);CodeAnalysis</Configurations>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />

<PackageReference Include="Moq" Version="4.7.142.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="xunit.abstractions" Version="2.0.1" />
<PackageReference Include="xunit.assert" Version="2.3.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />

<Compile Remove="AppDomainUtils.cs;Microsoft\TestCommon\RuntimeEnvironment.cs;WebUtils.cs"
Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "/>
<Reference Include="System.Web" Condition=" '$(TargetFramework)' == 'net452' " />
</ItemGroup>
<ItemGroup>
<Compile Include="DataAttribute.cs" />
<Compile Include="EnumHelperTestBase.cs" />
<Compile Include="ExceptionUtility.cs" />
<Compile Include="FactDiscoverer.cs" />
<Compile Include="InlineDataAttribute.cs" />
<Compile Include="MatrixTheoryDataSet.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\TestDataHolder.cs" />
<Compile Include="Microsoft\TestCommon\Types\ByteEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\SByteEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\ShortEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\UIntEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\UShortEnum.cs" />
<Compile Include="Platform.cs" />
<Compile Include="PlatformInfo.cs" />
<Compile Include="PortReserver.cs" />
<Compile Include="PropertyDataAttribute.cs" />
<Compile Include="ReplaceCultureAttribute.cs" />
<Compile Include="RestoreThreadPrincipalAttribute.cs" />
<Compile Include="AppDomainUtils.cs" />
<Compile Include="Assert.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CultureReplacer.cs" />
<Compile Include="FactAttribute.cs" />
<Compile Include="SkippedXunitTestCase.cs" />
<Compile Include="TheoryAttribute.cs" />
<Compile Include="DictionaryEqualityComparer.cs" />
<Compile Include="ExceptionAssertions.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ForceGCAttribute.cs" />
<Compile Include="MemberHelper.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\RefTypeTestData.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\TestDataVariations.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\ValueTypeTestData.cs" />
<Compile Include="Microsoft\TestCommon\GenericTypeAssert.cs" />
<Compile Include="Microsoft\TestCommon\HttpAssert.cs" />
<Compile Include="Microsoft\TestCommon\MediaTypeAssert.cs" />
<Compile Include="Microsoft\TestCommon\MediaTypeHeaderValueComparer.cs" />
<Compile Include="Microsoft\TestCommon\ParsedMediaTypeHeaderValue.cs" />
<Compile Include="Microsoft\TestCommon\RegexReplacement.cs" />
<Compile Include="Microsoft\TestCommon\RuntimeEnvironment.cs" />
<Compile Include="Microsoft\TestCommon\SerializerAssert.cs" />
<Compile Include="Microsoft\TestCommon\StreamAssert.cs" />
<Compile Include="Microsoft\TestCommon\TaskAssert.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\TestData.cs" />
<Compile Include="Microsoft\TestCommon\TestDataSetAttribute.cs" />
<Compile Include="Microsoft\TestCommon\TimeoutConstant.cs" />
<Compile Include="Microsoft\TestCommon\TypeAssert.cs" />
<Compile Include="Microsoft\TestCommon\Types\FlagsEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\INameAndIdContainer.cs" />
<Compile Include="Microsoft\TestCommon\Types\ISerializableType.cs" />
<Compile Include="Microsoft\TestCommon\Types\LongEnum.cs" />
<Compile Include="Microsoft\TestCommon\Types\SimpleEnum.cs" />
<Compile Include="Microsoft\TestCommon\DataSets\CommonUnitTestDataSets.cs" />
<Compile Include="Microsoft\TestCommon\XmlAssert.cs" />
<Compile Include="PreAppStartTestHelper.cs" />
<Compile Include="PreserveSyncContextAttribute.cs" />
<Compile Include="ReflectionAssert.cs" />
<Compile Include="TestFile.cs" />
<Compile Include="TestHelper.cs" />
<Compile Include="TheoryDataSet.cs" />
<Compile Include="TheoryDiscoverer.cs" />
<Compile Include="ThreadPoolSyncContext.cs" />
<Compile Include="TraitAttribute.cs" />
<Compile Include="VersionTestHelper.cs" />
<Compile Include="WebUtils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties xunit_1runner_1json__JSONSchema="https://xunit.github.io/schema/v2.1-rc1/xunit.runner.schema.json" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
8 changes: 0 additions & 8 deletions test/Microsoft.TestCommon/packages.config
View file
Open in desktop

This file was deleted.

Loading