Skip to content

Commit bc34728

Browse files
idg10idg10
authored
Update test packages (#2101)
Remove test cert for UWP test runner package - no longer seems to be necessary
1 parent 044ff7c commit bc34728

File tree

6 files changed

+44
-19
lines changed

6 files changed

+44
-19
lines changed

‎Rx.NET/Source/CodeCoverage.runsettings

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- File name extension must be .runsettings -->
33
<RunSettings>
4+
<!--
5+
Workaround for failure to run tests on .NET FX on v3.3.1 MSTest packages
6+
-->
7+
<RunConfiguration>
8+
<DisableAppDomain>True</DisableAppDomain>
9+
</RunConfiguration>
10+
411
<DataCollectionRunSettings>
512
<DataCollectors>
613
<DataCollector friendlyName="XPlat code coverage">

‎Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
<ItemGroup>
2020
<EmbeddedResource Include="Properties\*.xml" />
21-
<PackageReference Include="xunit.assert.source" Version="2.4.2" PrivateAssets="All" />
21+
<PackageReference Include="xunit.assert.source" Version="2.8.0" PrivateAssets="All" />
2222
<ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<None Include="build\NuGet.Readme.md" Pack="true" PackagePath="\readme.md"/>
26+
<None Include="build\NuGet.Readme.md" Pack="true" PackagePath="\readme.md" />
2727

2828
<!--
2929
Workaround for https://github.com/xunit/xunit/issues/2703

‎Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,22 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2929
<PackageReference Include="Verify.Xunit" Version="20.4.0" />
30-
<PackageReference Include="xunit" Version="2.4.2" />
31-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
32-
<PackageReference Include="DiffPlex" Version="1.7.1" />
30+
<PackageReference Include="xunit" Version="2.8.0" />
31+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="DiffPlex" Version="1.7.2" />
3336
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
3437
</ItemGroup>
3538

39+
<ItemGroup>
40+
<PackageReference Update="coverlet.collector" Version="6.0.2">
41+
<PrivateAssets>all</PrivateAssets>
42+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43+
</PackageReference>
44+
</ItemGroup>
45+
3646
</Project>

‎Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
20-
<PackageCertificateKeyFile>Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx</PackageCertificateKeyFile>
21-
<PackageCertificateThumbprint>8570A5641EDE61A2AB21E12809E9E0376A041E8C</PackageCertificateThumbprint>
22-
<SignAssembly>false</SignAssembly>
23-
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
20+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
2421
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
2522
</PropertyGroup>
2623
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -125,7 +122,6 @@
125122
<AppxManifest Include="Package.appxmanifest">
126123
<SubType>Designer</SubType>
127124
</AppxManifest>
128-
<None Include="Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx" />
129125
</ItemGroup>
130126
<ItemGroup>
131127
<Content Include="Properties\Default.rd.xml" />
@@ -138,10 +134,15 @@
138134
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
139135
</ItemGroup>
140136
<ItemGroup>
141-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
142-
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
143-
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
144-
<PackageReference Include="xunit.assert" Version="2.4.2" />
137+
<!--
138+
Downgrading to 6.2.12 because that's the version the facade packages currently end up with.
139+
(It's not entirely clear where they get that from, but I think it's to do with the
140+
Windows API version they select, and I don't want to upgrade those to a newer version.)
141+
-->
142+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
143+
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
144+
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
145+
<PackageReference Include="xunit.assert" Version="2.8.0" />
145146
</ItemGroup>
146147
<ItemGroup>
147148
<ApplicationDefinition Include="App.xaml">

‎Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx

-2.45 KB
Binary file not shown.

‎Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,19 @@
2828
Before that PR was merged, the test runner wouldn't work if the host specified a TFM with a
2929
specific Windows version.
3030
-->
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
32-
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
33-
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
34-
<PackageReference Include="xunit.assert" Version="2.4.2" />
31+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
32+
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
33+
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
34+
<PackageReference Include="xunit.assert" Version="2.8.0" />
3535
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
3636
<ProjectReference Include="..\..\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" />
3737
<ProjectReference Include="..\..\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" />
3838
</ItemGroup>
39+
40+
<ItemGroup>
41+
<PackageReference Update="coverlet.collector" Version="6.0.2">
42+
<PrivateAssets>all</PrivateAssets>
43+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
44+
</PackageReference>
45+
</ItemGroup>
3946
</Project>

0 commit comments

Comments
 (0)