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

Jump to bottom

[main] Update dependencies from dotnet/xharness #19585

Merged
merged 3 commits into from Jan 9, 2024
Merged

[main] Update dependencies from dotnet/xharness #19585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e1e6e0
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Dec 25, 2023
cb4271e
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jan 1, 2024
3802568
Try update catalyst to use the xharness installed
rmarinho Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.23616.1",
"version": "9.0.0-prerelease.23620.1",
"commands": [
"xharness"
]
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.23616.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.23620.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>71422c1795f1b6e04feb507ec96a91b25354a2ff</Sha>
<Sha>b645a7369491a5d0f5307faf62c3c8b15633c8f6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.23616.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.23620.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>71422c1795f1b6e04feb507ec96a91b25354a2ff</Sha>
<Sha>b645a7369491a5d0f5307faf62c3c8b15633c8f6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.23616.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.23620.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>71422c1795f1b6e04feb507ec96a91b25354a2ff</Sha>
<Sha>b645a7369491a5d0f5307faf62c3c8b15633c8f6</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Expand Up @@ -78,9 +78,9 @@
<_HarfBuzzSharpVersion>7.3.0</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.114</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23616.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23616.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23616.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23620.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23620.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23620.1</MicrosoftDotNetXHarnessCLIVersion>
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
Expand Down
36 changes: 23 additions & 13 deletions eng/devices/catalyst.cake
View file
Open in desktop
Expand Up @@ -29,8 +29,25 @@ Information("Build Configuration: {0}", CONFIGURATION);
Information("Build Runtime Identifier: {0}", RUNTIME_IDENTIFIER);
Information("Build Target Framework: {0}", TARGET_FRAMEWORK);

string DOTNET_TOOL_PATH = "/usr/local/share/dotnet/dotnet";

var localDotnetiOS = GetBuildVariable("workloads", "local") == "local";
if (localDotnetiOS)
{
Information("Using local dotnet");
DOTNET_TOOL_PATH = $"{MakeAbsolute(Directory("../../bin/dotnet/")).ToString()}/dotnet";
}
else
{
Information("Using system dotnet");
}

Setup(context =>
{
Information($"DOTNET_TOOL_PATH {DOTNET_TOOL_PATH}");
Information("Host OS System Arch: {0}", System.Runtime.InteropServices.RuntimeInformation.OSArchitecture);
Information("Host Processor System Arch: {0}", System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture);

Cleanup();
});

Expand All @@ -54,23 +71,13 @@ Task("Build")
var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-catalyst.binlog";

Information($"Build target dotnet root: {DOTNET_ROOT}");
Information($"Build target set dotnet tool path: {DOTNET_PATH}");

var localDotnetRoot = MakeAbsolute(Directory("../../bin/dotnet/"));
Information("new dotnet root: {0}", localDotnetRoot);

DOTNET_ROOT = localDotnetRoot.ToString();

SetDotNetEnvironmentVariables(DOTNET_ROOT);

DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
Configuration = CONFIGURATION,
Framework = TARGET_FRAMEWORK,
MSBuildSettings = new DotNetMSBuildSettings {
MaxCpuCount = 0
},
ToolPath = DOTNET_PATH,
ToolPath = DOTNET_TOOL_PATH,
ArgumentCustomization = args => args
.Append("/p:BuildIpa=true")
.Append("/p:RuntimeIdentifier=" + RUNTIME_IDENTIFIER)
Expand Down Expand Up @@ -111,12 +118,13 @@ Task("Test")
// We want to publish those files for reference
DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);

SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
//SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
}


var settings = new DotNetToolSettings {
DiagnosticOutput = true,
ToolPath = DOTNET_TOOL_PATH,
ArgumentCustomization = args => args.Append("run xharness apple test " +
$"--app=\"{TEST_APP}\" " +
$"--targets=\"{TEST_DEVICE}\" " +
Expand Down Expand Up @@ -180,6 +188,7 @@ Task("uitest")
Information("Run App project {0}",TEST_APP_PROJECT.FullPath);
DotNetBuild(TEST_APP_PROJECT.FullPath, new DotNetBuildSettings {
Configuration = CONFIGURATION,
ToolPath = DOTNET_TOOL_PATH,
ArgumentCustomization = args => args
.Append($"-f {TARGET_FRAMEWORK}")
.Append("-t:Run")
Expand All @@ -191,6 +200,7 @@ Task("uitest")
var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-mac.binlog";
DotNetBuild(PROJECT.FullPath, new DotNetBuildSettings {
Configuration = CONFIGURATION,
ToolPath = DOTNET_TOOL_PATH,
ArgumentCustomization = args => args
.Append("/p:ExtraDefineConstants=MACUITEST")
.Append("/bl:" + binlog)
Expand All @@ -200,7 +210,7 @@ Task("uitest")
SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_mac.log");

Information("Run UITests project {0}",PROJECT.FullPath);
RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true, resultsFileNameWithoutExtension: $"{name}-{CONFIGURATION}-catalyst");
RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, pathDotnet: DOTNET_TOOL_PATH, noBuild: true, resultsFileNameWithoutExtension: $"{name}-{CONFIGURATION}-catalyst");
});

RunTarget(TARGET);