Skip to content

Convert dotnet-format integration tests from pipeline YAML to MSTest/Helix #55399

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

Draft
MichaelSimons wants to merge 1 commit into
base: main
Choose a base branch
from
+498 −306
Draft

Convert dotnet-format integration tests from pipeline YAML to MSTest/Helix #55399

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
10 changes: 0 additions & 10 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,16 +366,6 @@ extends:
runtimeIdentifier: osx-arm64
osProperties: /p:CrossBuild=true

############### DOTNET-FORMAT ###############
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/dotnet-format/dotnet-format-integration.yml@self
parameters:
oneESCompat:
templateFolderName: templates-official
publishTaskPrefix: 1ES.
populateInternalRuntimeVariables: true
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)

############### PUBLISH STAGE ###############
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- stage: publish
Expand Down
2 changes: 0 additions & 2 deletions .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,3 @@ stages:
macOSJobParameterSets:
- runtimeIdentifier: osx-x64

############### DOTNET-FORMAT ###############
- template: /eng/dotnet-format/dotnet-format-integration.yml
123 changes: 0 additions & 123 deletions eng/dotnet-format/dotnet-format-integration.yml
View file
Open in desktop

This file was deleted.

138 changes: 0 additions & 138 deletions eng/dotnet-format/format-verifier.ps1
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions eng/dotnet-format/integration-test.cmd
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions eng/dotnet-format/validate.rsp
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions scripts/EvaluateConditionalTestScopes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,11 @@ static void ValidatePatternBaseDir(string repoRoot, string pattern, string conte
return;
}

// Get the directory portion before the first wildcard
var baseDir = normalized[..firstWildcard].TrimEnd('/');
// Get the last complete directory segment before the first wildcard.
// For "test/dotnet-format.*/**", this gives "test" (not "test/dotnet-format.").
var prefixBeforeWildcard = normalized[..firstWildcard];
var lastSlash = prefixBeforeWildcard.LastIndexOf('/');
var baseDir = lastSlash >= 0 ? prefixBeforeWildcard[..lastSlash] : "";
if (string.IsNullOrEmpty(baseDir))
{
return;
Expand Down
1 change: 1 addition & 0 deletions sdk.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@
<Project Path="test/Microsoft.NET.Build.Tasks.Tests/Microsoft.NET.Build.Tasks.Tests.csproj" />
<Project Path="test/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj" />
<Project Path="test/ArgumentsReflector/ArgumentsReflector.csproj" />
<Project Path="test/dotnet-format.IntegrationTests/dotnet-format.IntegrationTests.csproj" />
<Project Path="test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj" />
<Project Path="test/dotnet-MsiInstallation.Tests/dotnet-MsiInstallation.Tests.csproj" />
<Project Path="test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj" />
Expand Down
3 changes: 2 additions & 1 deletion src/Dotnet.Format/dotnet-format.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\Dotnet.Format\\dotnet-format\\dotnet-format.csproj",
"test\\dotnet-format.UnitTests\\dotnet-format.UnitTests.csproj"
"test\\dotnet-format.UnitTests\\dotnet-format.UnitTests.csproj",
"test\\dotnet-format.IntegrationTests\\dotnet-format.IntegrationTests.csproj"
]
}
}
25 changes: 18 additions & 7 deletions test/ConditionalTests.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,16 @@
<RunAlways>CI</RunAlways>
</ConditionalTestScope>

<ConditionalTestScope Include="TemplateEngine">
<ConditionalTestScope Include="DotnetFormat">

@MichaelSimons MichaelSimons Jul 23, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This diff of this file may be confusing. I added the DotnetFormat scope as well re-ordered the existing TemplateEngine scope to be in alphabetical order.

<Mechanism>project</Mechanism>
<TestProjects>test/TemplateEngine/**/*.csproj</TestProjects>
<TestProjects>test/dotnet-format.*/**/*.csproj</TestProjects>
<TriggerPaths>
documentation/TemplateEngine/Samples/**;
src/TemplateEngine/**;
template_feed/Microsoft.TemplateEngine.Authoring.Templates/**;
test/TemplateEngine/**;
test/TestAssets/TestPackages/TemplateEngine/**
src/Dotnet.Format/**;
test/dotnet-format.*/**
</TriggerPaths>
<RunAlways>CI</RunAlways>
</ConditionalTestScope>

<ConditionalTestScope Include="NetAnalyzers">
<Mechanism>project</Mechanism>
<TestProjects>src/Microsoft.CodeAnalysis.NetAnalyzers/tests/**/*.csproj</TestProjects>
Expand All @@ -65,6 +63,19 @@
</TriggerPaths>
<RunAlways>CI</RunAlways>
</ConditionalTestScope>

<ConditionalTestScope Include="TemplateEngine">
<Mechanism>project</Mechanism>
<TestProjects>test/TemplateEngine/**/*.csproj</TestProjects>
<TriggerPaths>
documentation/TemplateEngine/Samples/**;
src/TemplateEngine/**;
template_feed/Microsoft.TemplateEngine.Authoring.Templates/**;
test/TemplateEngine/**;
test/TestAssets/TestPackages/TemplateEngine/**
</TriggerPaths>
<RunAlways>CI</RunAlways>
</ConditionalTestScope>
</ItemGroup>

</Project>
Loading
Loading