Skip to content

Commit

Permalink
Revert adding Windows DeviceTests to .NET 7 (#16970)
Browse files Browse the repository at this point in the history
* Update TestBase.cs

* Revert "Update TestBase.cs"

This reverts commit d761d34.

* Update AssertionExtensions.iOS.cs

* Revert "Update AssertionExtensions.iOS.cs"

This reverts commit f88d9f1.

* Revert "Enable Windows device tests on net7.0 (#16756)"
  • Loading branch information
jfversluis authored Aug 24, 2023
1 parent 5bdb8b4 commit 6f75ecf
Show file tree
Hide file tree
Showing 33 changed files with 56 additions and 665 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "2.3.0",
"version": "1.2.0",
"commands": [
"dotnet-cake"
]
Expand Down
44 changes: 1 addition & 43 deletions eng/cake/dotnet.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// Contains .NET related Cake targets

#addin "nuget:?package=Cake.FileHelpers&version=3.2.1"
// Contains .NET 6-related Cake targets

var ext = IsRunningOnWindows() ? ".exe" : "";
var dotnetPath = $"./bin/dotnet/dotnet{ext}";
Expand Down Expand Up @@ -730,46 +728,6 @@ void RunTestWithLocalDotNet(string csproj)
});
}

void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = null, Dictionary<string,string> argsExtra = null, bool noBuild = false)
{
var name = System.IO.Path.GetFileNameWithoutExtension(csproj);
var binlog = $"{GetLogDirectory()}/{name}-{config}.binlog";
var results = $"{name}-{config}.trx";

Information("Run Test binlog: {0}", binlog);

var settings = new DotNetTestSettings
{
Configuration = config,
NoBuild = noBuild,
Loggers = {
$"trx;LogFileName={results}"
},
ResultsDirectory = GetTestResultsDirectory(),
//Verbosity = Cake.Common.Tools.DotNetCore.DotNetCoreVerbosity.Diagnostic,
ArgumentCustomization = args =>
{
args.Append($"-bl:{binlog}");
// args.Append($"/tl");
if(argsExtra != null)
{
foreach(var prop in argsExtra)
{
args.Append($"/p:{prop.Key}={prop.Value}");
}
}
return args;
}
};

if(!string.IsNullOrEmpty(pathDotnet))
{
settings.ToolPath = pathDotnet;
}

DotNetTest(csproj, settings);
}

DirectoryPath PrepareSeparateBuildContext(string dirName, bool generateDirectoryProps = false)
{
var dir = GetTempDirectory().Combine(dirName);
Expand Down
302 changes: 0 additions & 302 deletions eng/devices/windows.cake

This file was deleted.

Loading

0 comments on commit 6f75ecf

Please sign in to comment.