Skip to content

Commit 90b7906

Browse files
chore(deps): Bump MSTest.TestAdapter, Microsoft.NET.Test.Sdk and Newtonsoft.Json (#1051)
1 parent 6f428f2 commit 90b7906

File tree

15 files changed

+535
-532
lines changed

15 files changed

+535
-532
lines changed
Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>Axe.Windows.ActionsTests</RootNamespace>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageReference Include="Codecov" Version="1.13.0" />
10-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<ProjectReference Include="..\Actions\Actions.csproj" />
26-
<ProjectReference Include="..\Core\Core.csproj" />
27-
</ItemGroup>
28-
29-
<Import Project="..\..\build\NetStandardTest.targets" />
30-
31-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<RootNamespace>Axe.Windows.ActionsTests</RootNamespace>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Codecov" Version="1.13.0" />
10+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="Moq" Version="4.18.4" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
17+
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18+
<PackageReference Include="coverlet.collector" Version="6.0.2">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\Actions\Actions.csproj" />
26+
<ProjectReference Include="..\Core\Core.csproj" />
27+
</ItemGroup>
28+
29+
<Import Project="..\..\build\NetStandardTest.targets" />
30+
31+
</Project>
Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>Axe.Windows.AutomationTests</RootNamespace>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageReference Include="Codecov" Version="1.13.0" />
10-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<ProjectReference Include="..\Automation\Automation.csproj" />
26-
<ProjectReference Include="..\UnitTestSharedLibrary\UnitTestSharedLibrary.csproj" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<Reference Include="Interop.UIAutomationClient">
31-
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
32-
<EmbedInteropTypes>true</EmbedInteropTypes>
33-
</Reference>
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<Reference Include="Interop.UIAutomationCore">
38-
<HintPath>..\InteropDummy\bin\$(Configuration)\net6.0\Interop.UIAutomationCore.dll</HintPath>
39-
<EmbedInteropTypes>true</EmbedInteropTypes>
40-
</Reference>
41-
</ItemGroup>
42-
43-
<Import Project="..\..\build\NetStandardTest.targets" />
44-
45-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<RootNamespace>Axe.Windows.AutomationTests</RootNamespace>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Codecov" Version="1.13.0" />
10+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="Moq" Version="4.18.4" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
17+
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18+
<PackageReference Include="coverlet.collector" Version="6.0.2">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\Automation\Automation.csproj" />
26+
<ProjectReference Include="..\UnitTestSharedLibrary\UnitTestSharedLibrary.csproj" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<Reference Include="Interop.UIAutomationClient">
31+
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
32+
<EmbedInteropTypes>true</EmbedInteropTypes>
33+
</Reference>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<Reference Include="Interop.UIAutomationCore">
38+
<HintPath>..\InteropDummy\bin\$(Configuration)\net6.0\Interop.UIAutomationCore.dll</HintPath>
39+
<EmbedInteropTypes>true</EmbedInteropTypes>
40+
</Reference>
41+
</ItemGroup>
42+
43+
<Import Project="..\..\build\NetStandardTest.targets" />
44+
45+
</Project>

src/CLITests/CLITests.csproj

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>AxeWindowsCLITests</RootNamespace>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageReference Include="Codecov" Version="1.13.0" />
10-
<PackageReference Include="coverlet.collector" Version="6.0.2">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
19-
<PackageReference Include="Moq" Version="4.18.4" />
20-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
21-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<ProjectReference Include="..\Automation\Automation.csproj" />
26-
<ProjectReference Include="..\CLI\CLI.csproj" />
27-
</ItemGroup>
28-
29-
<Import Project="..\..\build\NetStandardTest.targets" />
30-
31-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<RootNamespace>AxeWindowsCLITests</RootNamespace>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Codecov" Version="1.13.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.2">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
19+
<PackageReference Include="Moq" Version="4.18.4" />
20+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
21+
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\Automation\Automation.csproj" />
26+
<ProjectReference Include="..\CLI\CLI.csproj" />
27+
</ItemGroup>
28+
29+
<Import Project="..\..\build\NetStandardTest.targets" />
30+
31+
</Project>

src/CoreTests/CoreTests.csproj

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>Axe.Windows.CoreTests</RootNamespace>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageReference Include="Codecov" Version="1.13.0" />
10-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<ProjectReference Include="..\Core\Core.csproj" />
26-
<ProjectReference Include="..\UnitTestSharedLibrary\UnitTestSharedLibrary.csproj" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<None Update="Resources\A11yElementTest.hier">
31-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
32-
</None>
33-
<None Update="Resources\A11yPatternTest.hier">
34-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35-
</None>
36-
<None Update="Resources\A11yPropertyTest.hier">
37-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
38-
</None>
39-
</ItemGroup>
40-
41-
<Import Project="..\..\build\NetStandardTest.targets" />
42-
43-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<RootNamespace>Axe.Windows.CoreTests</RootNamespace>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Codecov" Version="1.13.0" />
10+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="Moq" Version="4.18.4" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
17+
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18+
<PackageReference Include="coverlet.collector" Version="6.0.2">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\Core\Core.csproj" />
26+
<ProjectReference Include="..\UnitTestSharedLibrary\UnitTestSharedLibrary.csproj" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<None Update="Resources\A11yElementTest.hier">
31+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
32+
</None>
33+
<None Update="Resources\A11yPatternTest.hier">
34+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35+
</None>
36+
<None Update="Resources\A11yPropertyTest.hier">
37+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
38+
</None>
39+
</ItemGroup>
40+
41+
<Import Project="..\..\build\NetStandardTest.targets" />
42+
43+
</Project>

src/CurrentFileVersionCompatibilityTests/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
11+
</dependentAssembly>
812
</assemblyBinding>
913
</runtime>
1014
</configuration>

src/CurrentFileVersionCompatibilityTests/CurrentFileVersionCompatibilityTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<Reference Include="Axe.Windows.Win32, Version=0.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Axe.Windows.0.3.1-prerelease\lib\net471\Axe.Windows.Win32.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
63+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6565
</Reference>
6666
<Reference Include="System" />
6767
<Reference Include="System.Drawing" />
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<!-- Reminder: Axe.Windows and Newtonsoft are INTENTIONALLY PINNED on old versions in this project! -->
43
<package id="Axe.Windows" version="0.3.1-prerelease" targetFramework="net472" />
5-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net472" />
4+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
65
</packages>

0 commit comments

Comments
 (0)