Skip to content

Rework test adapter project #284

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 1 commit into from
Nov 26, 2024
Merged

Rework test adapter project #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions poc/TestOfTestFrameworkByReference/nano.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<!-- Configurations that affect the Test Framework -->
<RunConfiguration>
Expand All @@ -8,7 +8,7 @@
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
<TargetPlatform>x64</TargetPlatform>
<!-- Comment the following line or adjust it if you want to test the TestAdapter. Path has to be absolute or relative to the build folder of the test dll -->
<!-- <TestAdaptersPaths>E:\GitHub\nf-nanoFramework.TestFramework\source\TestAdapter\bin\Debug\net4.8;E:\GitHub\nf-nanoFramework.TestFramework\source\UnitTestLauncher\bin\Debug</TestAdaptersPaths> -->
<!-- <TestAdaptersPaths>E:\GitHub\nf-nanoFramework.TestFramework\source\TestAdapter\bin\Debug\net48;E:\GitHub\nf-nanoFramework.TestFramework\source\UnitTestLauncher\bin\Debug</TestAdaptersPaths> -->
</RunConfiguration>
<nanoFrameworkAdapter>
<Logging>None</Logging>
Expand Down
12 changes: 6 additions & 6 deletions source/TestAdapter/nanoFramework.TestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net4.8</TargetFramework>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputType>Library</OutputType>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<LangVersion>8.0</LangVersion>
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.7" />
<PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
<PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.3" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
<PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.4" />
<PackageReference Include="Nerdbank.GitVersioning">
<Version>3.6.146</Version>
<PrivateAssets>all</PrivateAssets>
Expand Down
171 changes: 157 additions & 14 deletions source/TestAdapter/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Direct",
"requested": "[17.10.0, )",
"resolved": "17.10.0",
"contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==",
"requested": "[17.12.0, )",
"resolved": "17.12.0",
"contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==",
"dependencies": {
"System.Reflection.Metadata": "1.6.0"
}
},
"nanoFramework.Tools.Debugger.Net": {
"type": "Direct",
"requested": "[2.5.3, )",
"resolved": "2.5.3",
"contentHash": "j3w8QO2eupDVtxHEohlETSrQVTO5x1jZQAlgbW9VB15bYbniaeKZ+S55rwgGFeYQpEmNjgp1ArY5HkmD7AfVHw==",
"requested": "[2.5.4, )",
"resolved": "2.5.4",
"contentHash": "5H4kqe8+CskYxKDpslfLmn7Z39SjkTT9NUHTRkO3d9oyplL1lLvR1YJkwaipNxveTfg78EziFMjsK7QLWo+WCg==",
"dependencies": {
"CommunityToolkit.Mvvm": "8.2.2",
"CommunityToolkit.Mvvm": "7.1.2",
"Polly": "7.2.4",
"System.IO.Ports": "8.0.0"
}
Expand All @@ -59,13 +59,12 @@
},
"CommunityToolkit.Mvvm": {
"type": "Transitive",
"resolved": "8.2.2",
"contentHash": "r0g0k9tGYdrnz8R7T3x5UiokDffeevzK/2P/9SBL6fqLgN8B157MIi/bVUWI1KAz6ZorZrK9AdABCWUeXZZsvA==",
"resolved": "7.1.2",
"contentHash": "/zEpNH3FIBFY2iZRBi+S3Sia3q2yJgy1IQHnWRW7MdhQIe3IGcA1TGqJdbtjiJBmNy4v7kkPdNzgYlvvNDjXZg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"System.ComponentModel.Annotations": "5.0.0",
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
"System.Memory": "4.5.4"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
Expand Down Expand Up @@ -138,8 +137,8 @@
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
"resolved": "4.5.3",
"contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
},
"System.Security.AccessControl": {
"type": "Transitive",
Expand Down Expand Up @@ -167,6 +166,150 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
}
},
"net6.0": {
"CliWrap": {
"type": "Direct",
"requested": "[3.6.7, )",
"resolved": "3.6.7",
"contentHash": "KYhA0OAGmNg22xI2OjkqG0zlgd61OCJOHYb+/uvSILriQNMQNmAjsRj7OqAh9dgltEuNpuPvN9+Y7pMBD/0NyQ=="
},
"ICSharpCode.Decompiler": {
"type": "Direct",
"requested": "[7.2.1.6856, )",
"resolved": "7.2.1.6856",
"contentHash": "0YtLSmDhFJb79+K4c/unBWT5ZHu9ov++k0gCfxIB6+uM/n5TEYjZMKSiEQDB6FeaeLPmduxB3SYxasLIDjuhEQ==",
"dependencies": {
"Microsoft.Win32.Registry": "5.0.0",
"System.Collections.Immutable": "5.0.0",
"System.Reflection.Metadata": "5.0.0"
}
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Direct",
"requested": "[17.12.0, )",
"resolved": "17.12.0",
"contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==",
"dependencies": {
"System.Reflection.Metadata": "1.6.0"
}
},
"nanoFramework.Tools.Debugger.Net": {
"type": "Direct",
"requested": "[2.5.4, )",
"resolved": "2.5.4",
"contentHash": "5H4kqe8+CskYxKDpslfLmn7Z39SjkTT9NUHTRkO3d9oyplL1lLvR1YJkwaipNxveTfg78EziFMjsK7QLWo+WCg==",
"dependencies": {
"CommunityToolkit.Mvvm": "7.1.2",
"Polly": "7.2.4",
"System.IO.Ports": "8.0.0"
}
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.6.146, )",
"resolved": "3.6.146",
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"CommunityToolkit.Mvvm": {
"type": "Transitive",
"resolved": "7.1.2",
"contentHash": "/zEpNH3FIBFY2iZRBi+S3Sia3q2yJgy1IQHnWRW7MdhQIe3IGcA1TGqJdbtjiJBmNy4v7kkPdNzgYlvvNDjXZg=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
},
"Microsoft.Win32.Registry": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
"dependencies": {
"System.Security.AccessControl": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"Polly": {
"type": "Transitive",
"resolved": "7.2.4",
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"runtime.linux-arm.runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "gK720fg6HemDg8sXcfy+xCMZ9+hF78Gc7BmREbmkS4noqlu1BAr9qZtuWGhLzFjBfgecmdtl4+SYVwJ1VneZBQ=="
},
"runtime.linux-arm64.runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "KYG6/3ojhEWbb3FwQAKgGWPHrY+HKUXXdVjJlrtyCLn3EMcNTaNcPadb2c0ndQzixZSmAxZKopXJr0nLwhOrpQ=="
},
"runtime.linux-x64.runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "Wnw5vhA4mgGbIFoo6l9Fk3iEcwRSq49a1aKwJgXUCUtEQLCSUDjTGSxqy/oMUuOyyn7uLHsH8KgZzQ1y3lReiQ=="
},
"runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "Ee7Sz5llLpTgyKIWzKI/GeuRSbFkOABgJRY00SqTY0OkTYtkB+9l5rFZfE7fxPA3c22RfytCBYkUdAkcmwMjQg==",
"dependencies": {
"runtime.linux-arm.runtime.native.System.IO.Ports": "8.0.0",
"runtime.linux-arm64.runtime.native.System.IO.Ports": "8.0.0",
"runtime.linux-x64.runtime.native.System.IO.Ports": "8.0.0",
"runtime.osx-arm64.runtime.native.System.IO.Ports": "8.0.0",
"runtime.osx-x64.runtime.native.System.IO.Ports": "8.0.0"
}
},
"runtime.osx-arm64.runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "rbUBLAaFW9oVkbsb0+XSrAo2QdhBeAyzLl5KQ6Oci9L/u626uXGKInsVJG6B9Z5EO8bmplC8tsMiaHK8wOBZ+w=="
},
"runtime.osx-x64.runtime.native.System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "IcfB4jKtM9pkzP9OpYelEcUX1MiDt0IJPBh3XYYdEISFF+6Mc+T8WWi0dr9wVh1gtcdVjubVEIBgB8BHESlGfQ=="
},
"System.Collections.Immutable": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g=="
},
"System.IO.Ports": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "MaiPbx2/QXZc62gm/DrajRrGPG1lU4m08GWMoWiymPYM+ba4kfACp2PbiYpqJ4QiFGhHD00zX3RoVDTucjWe9g==",
"dependencies": {
"runtime.native.System.IO.Ports": "8.0.0"
}
},
"System.Reflection.Metadata": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
},
"System.Security.AccessControl": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
"dependencies": {
"Microsoft.NETCore.Platforms": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
}
}
}
}
6 changes: 3 additions & 3 deletions source/package.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
</packageTypes>
</metadata>
<files>
<file src="TestAdapter\bin\Release\net4.8\*.dll" target="lib/net48" />
<file src="TestAdapter\bin\Release\net4.8\*.config" target="lib/net48" />
<file src="TestAdapter\bin\Release\net48\*.dll" target="lib/net48" />
<file src="TestAdapter\bin\Release\net48\*.config" target="lib/net48" />
<file src="UnitTestLauncher\bin\Release\nanoFramework.TestFramework.*" target="lib" />
<file src="UnitTestLauncher\bin\Release\nanoFramework.UnitTestLauncher.*" target="lib" />
<file src="runsettings\nano.runsettings" target="content" />
<file src="..\README.md" target="docs\" />
<file src="..\assets\nf-logo.png" target="images" />
<file src="..\LICENSE.md" target="" />
</files>
</package>
</package>