-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix global properties not propagating in new dotnet test for MTP #47464
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...rojects/TestProjectWithConditionOnGlobalProperty/OtherTestProject/OtherTestProject.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>$(CurrentTargetFramework)</TargetFramework> | ||
| <OutputType>Exe</OutputType> | ||
|
|
||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
|
|
||
| <GenerateProgramFile>false</GenerateProgramFile> | ||
| <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> | ||
| <IsTestingPlatformApplication Condition="'$(PROPERTY_TO_ENABLE_MTP)' != ''">true</IsTestingPlatformApplication> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" /> | ||
| </ItemGroup> | ||
| </Project> | ||
46 changes: 46 additions & 0 deletions
46
...tAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/OtherTestProject/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| using Microsoft.Testing.Platform.Builder; | ||
| using Microsoft.Testing.Platform.Capabilities.TestFramework; | ||
| using Microsoft.Testing.Platform.Extensions.Messages; | ||
| using Microsoft.Testing.Platform.Extensions.TestFramework; | ||
|
|
||
| var testApplicationBuilder = await TestApplication.CreateBuilderAsync(args); | ||
|
|
||
| testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter()); | ||
|
|
||
| using var testApplication = await testApplicationBuilder.BuildAsync(); | ||
| return await testApplication.RunAsync(); | ||
|
|
||
| public class DummyTestAdapter : ITestFramework, IDataProducer | ||
| { | ||
| public string Uid => nameof(DummyTestAdapter); | ||
|
|
||
| public string Version => "2.0.0"; | ||
|
|
||
| public string DisplayName => nameof(DummyTestAdapter); | ||
|
|
||
| public string Description => nameof(DummyTestAdapter); | ||
|
|
||
| public Task<bool> IsEnabledAsync() => Task.FromResult(true); | ||
|
|
||
| public Type[] DataTypesProduced => new[] { | ||
| typeof(TestNodeUpdateMessage) | ||
| }; | ||
|
|
||
| public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context) | ||
| => Task.FromResult(new CreateTestSessionResult() { IsSuccess = true }); | ||
|
|
||
| public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context) | ||
| => Task.FromResult(new CloseTestSessionResult() { IsSuccess = true }); | ||
|
|
||
| public async Task ExecuteRequestAsync(ExecuteRequestContext context) | ||
| { | ||
| await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode() | ||
| { | ||
| Uid = "Test1", | ||
| DisplayName = "Test1", | ||
| Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")), | ||
| })); | ||
|
|
||
| context.Complete(); | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/TestProject/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| using Microsoft.Testing.Platform.Builder; | ||
| using Microsoft.Testing.Platform.Capabilities.TestFramework; | ||
| using Microsoft.Testing.Platform.Extensions.Messages; | ||
| using Microsoft.Testing.Platform.Extensions.TestFramework; | ||
|
|
||
| ITestApplicationBuilder testApplicationBuilder = await TestApplication.CreateBuilderAsync(args); | ||
| testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter()); | ||
|
|
||
| ITestApplication testApplication = await testApplicationBuilder.BuildAsync(); | ||
| return await testApplication.RunAsync(); | ||
|
|
||
| public class DummyTestAdapter : ITestFramework, IDataProducer | ||
| { | ||
| public string Uid => nameof(DummyTestAdapter); | ||
|
|
||
| public string Version => "2.0.0"; | ||
|
|
||
| public string DisplayName => nameof(DummyTestAdapter); | ||
|
|
||
| public string Description => nameof(DummyTestAdapter); | ||
|
|
||
| public Task<bool> IsEnabledAsync() => Task.FromResult(true); | ||
|
|
||
| public Type[] DataTypesProduced => new[] { typeof(TestNodeUpdateMessage) }; | ||
|
|
||
| public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context) | ||
| => Task.FromResult(new CreateTestSessionResult() { IsSuccess = true }); | ||
|
|
||
| public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context) | ||
| => Task.FromResult(new CloseTestSessionResult() { IsSuccess = true }); | ||
|
|
||
| public async Task ExecuteRequestAsync(ExecuteRequestContext context) | ||
| { | ||
| await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode() | ||
| { | ||
| Uid = "Test0", | ||
| DisplayName = "Test0", | ||
| Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")), | ||
| })); | ||
|
|
||
| context.Complete(); | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
...sets/TestProjects/TestProjectWithConditionOnGlobalProperty/TestProject/TestProject.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>$(CurrentTargetFramework)</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <GenerateProgramFile>false</GenerateProgramFile> | ||
| <LangVersion>latest</LangVersion> | ||
| <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> | ||
| <IsTestingPlatformApplication Condition="'$(PROPERTY_TO_ENABLE_MTP)' != ''">true</IsTestingPlatformApplication> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
31 changes: 31 additions & 0 deletions
31
...cts/TestProjectWithConditionOnGlobalProperty/TestProjectWithConditionOnGlobalProperty.sln
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| | ||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.13.35505.181 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{D2E321F2-3513-99DE-C37E-6D48D15F404D}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherTestProject", "OtherTestProject/OtherTestProject.csproj", "{6171FC1F-E2F2-4F66-A8DE-EC4765081661}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {D2E321F2-3513-99DE-C37E-6D48D15F404D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {D2E321F2-3513-99DE-C37E-6D48D15F404D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {D2E321F2-3513-99DE-C37E-6D48D15F404D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {D2E321F2-3513-99DE-C37E-6D48D15F404D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {6171FC1F-E2F2-4F66-A8DE-EC4765081661}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {3D7914D1-7D03-4FFB-8D0F-7FFA6B6BA6A0} | ||
| EndGlobalSection | ||
| EndGlobal |
2 changes: 2 additions & 0 deletions
2
test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [dotnet.test:runner] | ||
| name= "Microsoft.Testing.Platform" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: Is it normal to have tabs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I copied from existing test assets, e.g:
https://github.com/dotnet/sdk/blob/main/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/OtherTestProject/OtherTestProject.csproj
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider ensuring formatting is aligned with .editorconfig which seems to be using two spaces for csproj. cc @mariam-abdulla