Skip to content

Commit 36e8381

Browse files
OsirisTerjeOsirisTerje
authored
Merge pull request #1416 from nunit/mtpupdate
Updated MTP bridge and a few other packages. Changed to slnx format
2 parents 7112ed6 + b37106b commit 36e8381

6 files changed

Lines changed: 59 additions & 126 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
88
<PackageVersion Include="NSubstitute" Version="5.3.0" />
9-
<PackageVersion Include="nunit" Version="4.4.0" />
9+
<PackageVersion Include="nunit" Version="4.5.0" />
1010
<PackageVersion Include="nunit.engine" Version="3.22.0" />
1111
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
1212
<PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
@@ -16,8 +16,8 @@
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1717
</PackageVersion>
1818
<PackageVersion Include="Castle.Core" Version="5.2.1" />
19-
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.0.2" />
20-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
19+
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.1.0" />
20+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.1.0" />
2121
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
2222
</ItemGroup>
2323
<ItemGroup>

‎NUnit3TestAdapter.sln‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎NUnit3TestAdapter.slnx‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Solution>
2+
<Folder Name="/nuget/">
3+
<File Path="nuget/NUnit3TestAdapter.nuspec" />
4+
</Folder>
5+
<Folder Name="/nuget/net462/">
6+
<File Path="nuget/net462/NUnit3TestAdapter.props" />
7+
<File Path="nuget/net462/NUnit3TestAdapter.targets" />
8+
</Folder>
9+
<Folder Name="/nuget/net8/">
10+
<File Path="nuget/net8.0/NUnit3TestAdapter.props" />
11+
<File Path="nuget/net8.0/NUnit3TestAdapter.targets" />
12+
</Folder>
13+
<Folder Name="/Solution Items/">
14+
<File Path=".editorconfig" />
15+
<File Path=".gitignore" />
16+
<File Path=".runsettings" />
17+
<File Path="build.cake" />
18+
<File Path="build.cmd" />
19+
<File Path="build.ps1" />
20+
<File Path="Directory.Packages.props" />
21+
<File Path="DisableAppDomain.runsettings" />
22+
<File Path="images/nunit_256.png" />
23+
<File Path="LICENSE" />
24+
<File Path="NuGet.Config" />
25+
<File Path="NUnit3TestAdapter.sln.DotSettings" />
26+
<File Path="Osiris.Extended.ruleset" />
27+
<File Path="README.md" />
28+
<File Path="src/Directory.Build.props" />
29+
<File Path="src/native-assembly/NativeTests.dll" />
30+
</Folder>
31+
<Folder Name="/Solution Items/github/">
32+
<File Path=".github/dependabot.yml" />
33+
<File Path=".github/ISSUE_TEMPLATE.md" />
34+
<File Path=".github/workflows/sonarbuild.yml.UnderWork" />
35+
</Folder>
36+
<Folder Name="/Solution Items/github/workflows/">
37+
<File Path=".github/workflows/NUnit3TestAdapter.CI.yml" />
38+
<File Path=".github/workflows/NUnit3TestAdapter.Myget.Publish.yml" />
39+
</Folder>
40+
<Folder Name="/Solution Items/images/">
41+
<File Path="images/nunit_256.png" />
42+
</Folder>
43+
<Project Path="src/empty-assembly/empty-assembly.csproj" />
44+
<Project Path="src/mock-assembly/mock-assembly.csproj" />
45+
<Project Path="src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj" />
46+
<Project Path="src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj" />
47+
<Project Path="src/NUnitTestAdapter/NUnit.TestAdapter.csproj" />
48+
<Project Path="src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj" />
49+
</Solution>

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var BIN_DIRS = new [] {
5050
};
5151

5252
// Solution
53-
var ADAPTER_SOLUTION = PROJECT_DIR + "NUnit3TestAdapter.sln";
53+
var ADAPTER_SOLUTION = PROJECT_DIR + "NUnit3TestAdapter.slnx";
5454

5555
//////////////////////////////////////////////////////////////////////
5656
// CLEAN

‎nuget/NUnit3TestAdapter.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
<dependencies>
2929
<group targetFramework="net462">
30-
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.2" />
31-
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.2" />
30+
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.1.0" />
31+
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.1.0" />
3232
</group>
3333
<group targetFramework="net8.0">
34-
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.2" />
35-
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.2" />
34+
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.1.0" />
35+
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.1.0" />
3636
<dependency id="Microsoft.Extensions.DependencyModel" version="8.0.2" />
3737
</group>
3838

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<LangVersion>14</LangVersion>
4+
<LangVersion>latest</LangVersion>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NUnitAdapter.snk</AssemblyOriginatorKeyFile>
77
<CodeAnalysisRuleSet>..\..\Osiris.Extended.ruleset</CodeAnalysisRuleSet>

0 commit comments

Comments
 (0)