Skip to content

Commit

Permalink
Merge pull request #304 from ViktorHofer/patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
clairernovotny committed May 2, 2022
2 parents 93c2964 + 42f4046 commit 37f3901
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Directory.build.props
Expand Up @@ -13,7 +13,7 @@
<DebugType>embedded</DebugType>
<LangVersion>latest</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)src/signing.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)src/signing.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -34,4 +34,4 @@
</ItemGroup>
</Target>

</Project>
</Project>
Expand Up @@ -12,12 +12,12 @@

<DevelopmentDependency>true</DevelopmentDependency>
<BuildOutputTargetFolder>build</BuildOutputTargetFolder>
<XunitVersion>2.4.1</XunitVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<NoWarn>$(NoWarn)1701;1702;NU5105</NoWarn>
<TargetPlatformVersion Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">10.0.19041.0</TargetPlatformVersion>
<!-- Set the PackageId explicitly as our different AssemblyNames will cause restore errors otherwise -->
<PackageId>xunit.runner.visualstudio</PackageId>
<XunitVersion>2.4.2-pre.12</XunitVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
4 changes: 2 additions & 2 deletions test/test.harness.uwp/test.harness.uwp.csproj
Expand Up @@ -111,7 +111,7 @@
<!-- I don't know where these are coming from, but older 4.0 versions are being included and causing downgrades -->
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
Expand All @@ -124,4 +124,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion test/test.harness/test.harness.csproj
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/test.testcasefilter/test.testcasefilter.csproj
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
</ItemGroup>

</Project>
Expand Up @@ -6,8 +6,8 @@

<ItemGroup>
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.reporters" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.reporters" Version="2.4.2-pre.12" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>

Expand Down

0 comments on commit 37f3901

Please sign in to comment.