Skip to content
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

Migrate to MSTest SDK instead of expecto #212

Draft
wants to merge 4 commits into
base: use-nuget-cpm
Choose a base branch
from
Draft

Migrate to MSTest SDK instead of expecto #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa57999
start converting to MSTest tests
baronfel Sep 22, 2024
e95eb68
continue converting tests
baronfel Sep 23, 2024
836caca
first passing tests
baronfel Sep 23, 2024
0e4a530
wip
baronfel Sep 23, 2024
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
14 changes: 7 additions & 7 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/test/Ionide.ProjInfo.Tests/bin/Debug/${input:tfm}/Ionide.ProjInfo.Tests.dll",
"args": [
"--filter",
"Main tests.${input:testName} - ${input:loader}"
],
// "args": [
// "--filter",
// "Main tests.${input:testName} - ${input:loader}"
// ],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole"
Expand All @@ -55,9 +55,9 @@
"description": "The TFM of the test to run",
"options": [
"net6.0",
"net7.0"
"net8.0"
],
"default": "net7.0",
"default": "net8.0",
"type": "pickString"
},
{
Expand All @@ -76,4 +76,4 @@
"type": "promptString"
}
]
}
}
6 changes: 1 addition & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />

<!-- Test packages -->
<PackageVersion Include="Expecto" Version="10.2.1" />
<PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
<PackageVersion Include="Expecto.Diff" Version="10.2.1" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="MedallionShell" Version="1.6.2" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />

<!-- CI/Build-related packages -->
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
Expand Down
1 change: 0 additions & 1 deletion src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">$(TargetFrameworks);net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 4 additions & 5 deletions src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">$(TargetFrameworks);net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,10 +21,10 @@
<ProjectReference Include="..\Ionide.ProjInfo.Sln\Ionide.ProjInfo.Sln.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="FSharp.Control.Reactive" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="FSharp.Control.Reactive" />
</ItemGroup>

<ItemGroup>
<!-- This lets us directly instanciate Projects in the tests -->
Expand Down
2 changes: 0 additions & 2 deletions src/Ionide.ProjInfo.Sln/paket.references
View file
Open in desktop

This file was deleted.

37 changes: 19 additions & 18 deletions src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">$(TargetFrameworks);net7.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>proj-info</ToolCommandName>
<RollForward>LatestMajor</RollForward>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>proj-info</ToolCommandName>
<RollForward>LatestMajor</RollForward>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Ionide.ProjInfo.ProjectSystem\Ionide.ProjInfo.ProjectSystem.fsproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Ionide.ProjInfo.ProjectSystem\Ionide.ProjInfo.ProjectSystem.fsproj" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" IncludeAssets="compile" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" IncludeAssets="compile" />
<PackageReference Include="Argu"/>
</ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime"
IncludeAssets="compile" />
<PackageReference Include="Argu" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">$(TargetFrameworks);net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="FsLibLog.fs" />
Expand Down
Loading
Loading