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

Use MSTest.Sdk (and migrate from VSTest to MTP) #728

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Use MSTest.Sdk (and migrate from VSTest to MTP) #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
827e7fc
Use MSTest.Sdk
Youssef1313 Nov 27, 2024
382b52a
Update STJ to get rid of vulnerability warning
Youssef1313 Nov 27, 2024
7f35931
Fix build
Youssef1313 Nov 27, 2024
1e8eefc
Merge branch 'master' into mstest-cleanup
Youssef1313 Feb 12, 2025
c8e6833
Update MSTest.Sdk version to 3.7.3
Youssef1313 Feb 12, 2025
7c23f47
Fix testing in CI
Youssef1313 Feb 12, 2025
2c0d1af
Cleanup
Youssef1313 Feb 12, 2025
e29697d
Fix CI
Youssef1313 Feb 12, 2025
65d1e20
Cleanup unused coverlet reference
Youssef1313 Feb 12, 2025
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
7 changes: 2 additions & 5 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ jobs:
run: ./build ci
if: ${{ runner.os != 'Windows' }}

- name: Test - Persistence
run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll

- name: Test - PAModel
run: dotnet bin/Debug/PAModelTests/PAModelTests.dll
Comment on lines -43 to -47
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joem-msft FYI the assembly YamlValidator.Tests.dll wasn't run in CI. It's better to dotnet test on the solution rather than listing individual dlls.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not start including the YamlValidator.Tests in the CI builds, as this project has been abandoned and not maintained.

- name: Test
run: dotnet test src/PASopa.sln --no-build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For maintainers: I would recommend to enable TRX report and Code Coverage.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go ahead and enable if you would like.


- name: Restore workloads for samples
run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj
Expand Down
3 changes: 3 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"sdk": {
"version": "8.0.0",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
"MSTest.Sdk": "3.7.3"
}
}
8 changes: 8 additions & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>
<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>

<!-- While these are already the defaults when using MSTest.Sdk, we are explicit about that. -->
<!-- It can be helpful if some new project is introduced and is not using MSTest.Sdk -->
<EnableMSTestRunner>true</EnableMSTestRunner>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>

<!-- Currently defaults to false -->
<TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
</PropertyGroup>

<PropertyGroup Label="Code Analysis config">
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/AppTestsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;

Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/ChecksumTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Reflection;
using System.Text;
using Microsoft.PowerPlatform.Formulas.Tools;
Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/DataSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// Licensed under the MIT License.

using System.Data;
using System.IO;
using System.IO.Compression;
using System.Linq;
using Microsoft.AppMagic.Authoring.Persistence;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.Extensions;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/DefaultValuesTransformTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.AppMagic.Authoring.Persistence;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/EditorStateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
using Microsoft.PowerPlatform.Formulas.Tools.IO;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/EntropyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;
using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/ErrorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;

Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/GroupControlRecreationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IR;

Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/NameCollisionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
Expand Down
9 changes: 2 additions & 7 deletions src/PAModelTests/PAModelTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSTest.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<PublicSign>true</PublicSign>
<EnableMSTestRunner>true</EnableMSTestRunner>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
<PackageReference Include="MSTest" Version="$(MSTest)" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
</ItemGroup>

<ItemGroup Label="Global usings">
<Using Include="FluentAssertions" />
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/PublicSurfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.Linq;
using System.Text;
using Microsoft.PowerPlatform.Formulas.Tools;

Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/ReadTransformTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
using Microsoft.PowerPlatform.Formulas.Tools.IO;
Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/RoundtripTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using Microsoft.PowerPlatform.Formulas.Tools;

namespace PAModelTests;
Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/SmartMergeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
using Microsoft.PowerPlatform.Formulas.Tools.IR;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/SourceDecoderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;

Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/TemplateParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.AppMagic.Authoring.Persistence;
using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/TemplateStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;
using Microsoft.PowerPlatform.Formulas.Tools.IR;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/UtilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools.IO;

namespace PAModelTests;
Expand Down
2 changes: 0 additions & 2 deletions src/PAModelTests/WriteTransformTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using System.Linq;
using Microsoft.PowerPlatform.Formulas.Tools;
using Microsoft.PowerPlatform.Formulas.Tools.IO;
using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools.Yaml;

namespace PAModelTests.YamlSerializerTests;
Expand Down
1 change: 0 additions & 1 deletion src/PAModelTests/YamlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.IO;
using Microsoft.PowerPlatform.Formulas.Tools.Yaml;
using YamlDotNet.Serialization;

Expand Down
8 changes: 1 addition & 7 deletions src/Persistence.Tests/Persistence.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSTest.Sdk">

<PropertyGroup>
<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<EnableMSTestRunner>true</EnableMSTestRunner>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>

<SignAssembly>true</SignAssembly>
Expand All @@ -28,16 +26,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
<PackageReference Include="MSTest" Version="$(MSTest)" />
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup>

<ItemGroup Label="Global usings">
<Using Include="FluentAssertions" />
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
<Using Include="Persistence.Tests.Extensions" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<PropertyGroup>
<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
<YamlDotNetVersion>15.1.6</YamlDotNetVersion>
<MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
<MSTestTestAdapterVersion>3.2.2</MSTestTestAdapterVersion>
<MSTestTestFrameworkVersion>3.2.2</MSTestTestFrameworkVersion>
<MSTest>3.2.2</MSTest>
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<MinVerVersion>4.3.0</MinVerVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
Expand Down
10 changes: 1 addition & 9 deletions src/YamlValidator.Tests/YamlValidator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSTest.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>

<SignAssembly>true</SignAssembly>
Expand All @@ -20,14 +19,7 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
<PackageReference Include="MSTest" Version="$(MSTest)" />
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
</ItemGroup>

<ItemGroup Label="Global usings">
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup>

Expand Down
Loading