Skip to content

Commit

Permalink
[net8.0] Merge main again (#15367)
Browse files Browse the repository at this point in the history 
### Description of Change

Yet another merge of main to net8
  • Loading branch information
@rmarinho
rmarinho committed Jun 1, 2023
2 parents ab6deff + 5fdb64a commit 2ddcc49
Show file tree
Hide file tree
Showing 96 changed files with 4,614 additions and 434 deletions.
83 changes: 83 additions & 0 deletions Microsoft.Maui-dev.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.UITests", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationTests", "src\TestUtils\src\Microsoft.Maui.IntegrationTests\Microsoft.Maui.IntegrationTests.csproj", "{A6976D43-B3A4-47AF-89D9-FA388B56B52B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{0AF0E771-4E09-4F05-B187-B43A2B9F62B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ControlGallery", "ControlGallery", "{DA908446-C6A1-473C-BF5C-83E600F5C69E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B37E707-EE0B-480E-AEB9-0176784879BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CBC63DBF-892C-4F03-890E-D48F25509CC6}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.ControlGallery.Issues.Shared", "src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.shproj", "{AE2513CB-4E5E-4E5C-8237-88954D4C9433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj", "{7A28BAB3-4396-415F-8473-2700027E57A7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Android", "src\Compatibility\ControlGallery\src\Android\Compatibility.ControlGallery.Android.csproj", "{36664529-91C2-49A5-BFDA-7D663FB19BC5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.iOS", "src\Compatibility\ControlGallery\src\iOS\Compatibility.ControlGallery.iOS.csproj", "{137B044D-31C4-4CF2-AB66-97C516AB8393}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.WinUI", "src\Compatibility\ControlGallery\src\WinUI\Compatibility.ControlGallery.WinUI.csproj", "{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.UITests.Shared", "src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Android.UITests", "src\Compatibility\ControlGallery\test\Android.UITests\Compatibility.ControlGallery.Android.UITests.csproj", "{2E41CBBF-999A-40F1-BF65-EA68585CA070}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.iOS.UITests", "src\Compatibility\ControlGallery\test\iOS.UITests\Compatibility.ControlGallery.iOS.UITests.csproj", "{306C0B6E-B797-40A0-994C-4F923E91F31B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI.UITests", "src\Compatibility\ControlGallery\test\WinUI.UITests\WinUI.UITests.csproj", "{B111C308-8B8B-4679-A229-39F80013D51E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -550,6 +576,40 @@ Global
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.Build.0 = Release|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.Build.0 = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Build.0 = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Deploy.0 = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Build.0 = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.ActiveCfg = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Build.0 = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Build.0 = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Deploy.0 = Release|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.Build.0 = Release|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.Build.0 = Release|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -649,8 +709,31 @@ Global
{E06CEFD4-237C-49F0-BE0F-C5F80AD8F64C} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{07C26A25-08C2-4C52-9574-1C33EC8E7919} = {E1082E26-D700-4127-9329-66D673FD2D55}
{A6976D43-B3A4-47AF-89D9-FA388B56B52B} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{DA908446-C6A1-473C-BF5C-83E600F5C69E} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0}
{9B37E707-EE0B-480E-AEB9-0176784879BE} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
{CBC63DBF-892C-4F03-890E-D48F25509CC6} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
{AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{7A28BAB3-4396-415F-8473-2700027E57A7} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{36664529-91C2-49A5-BFDA-7D663FB19BC5} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{137B044D-31C4-4CF2-AB66-97C516AB8393} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{2E41CBBF-999A-40F1-BF65-EA68585CA070} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{306C0B6E-B797-40A0-994C-4F923E91F31B} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{B111C308-8B8B-4679-A229-39F80013D51E} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{7a28bab3-4396-415f-8473-2700027e57a7}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions Microsoft.Maui-mac.slnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
"src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
"src\\TestUtils\\src\\TestUtils\\TestUtils.csproj",
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium.UITests\\TestUtils.Appium.UITests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium\\TestUtils.Appium.csproj",
"src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",
Expand Down
69 changes: 69 additions & 0 deletions Microsoft.Maui.LegacyControlGallery.slnf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"solution": {
"path": "Microsoft.Maui-dev.sln",
"projects": [
"src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj",
"src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj",
"src\\Compatibility\\ControlGallery\\src\\Android\\Compatibility.ControlGallery.Android.csproj",
"src\\Compatibility\\ControlGallery\\src\\Core\\Compatibility.ControlGallery.Core.csproj",
"src\\Compatibility\\ControlGallery\\src\\Issues.Shared\\Compatibility.ControlGallery.Issues.Shared.shproj",
"src\\Compatibility\\ControlGallery\\src\\UITests.Shared\\Compatibility.UITests.Shared.shproj",
"src\\Compatibility\\ControlGallery\\src\\WinUI\\Compatibility.ControlGallery.WinUI.csproj",
"src\\Compatibility\\ControlGallery\\src\\iOS\\Compatibility.ControlGallery.iOS.csproj",
"src\\Compatibility\\ControlGallery\\test\\Android.UITests\\Compatibility.ControlGallery.Android.UITests.csproj",
"src\\Compatibility\\ControlGallery\\test\\WinUI.UITests\\WinUI.UITests.csproj",
"src\\Compatibility\\ControlGallery\\test\\iOS.UITests\\Compatibility.ControlGallery.iOS.UITests.csproj",
"src\\Controls\\Foldable\\src\\Controls.Foldable.csproj",
"src\\Controls\\Maps\\src\\Controls.Maps.csproj",
"src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj",
"src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj",
"src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj",
"src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj",
"src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj",
"src\\Controls\\src\\Core.Design\\Controls.Core.Design.csproj",
"src\\Controls\\src\\Core\\Controls.Core.csproj",
"src\\Controls\\src\\NuGet\\Controls.NuGet.csproj",
"src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
"src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Controls\\tests\\Core.Design.UnitTests\\Controls.Core.Design.UnitTests.csproj",
"src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj",
"src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
"src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
"src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.InternalsVisibleAssembly\\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests\\Controls.Xaml.UnitTests.csproj",
"src\\Core\\maps\\src\\Maps.csproj",
"src\\Core\\src\\Core.csproj",
"src\\Core\\tests\\Benchmarks.Droid\\Benchmarks.Droid.csproj",
"src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
"src\\Core\\tests\\DeviceTests.Shared\\Core.DeviceTests.Shared.csproj",
"src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
"src\\Core\\tests\\UnitTests\\Core.UnitTests.csproj",
"src\\Essentials\\samples\\Sample.Server.WebAuthenticator\\Essentials.Sample.Server.WebAuthenticator.csproj",
"src\\Essentials\\samples\\Samples\\Essentials.Sample.csproj",
"src\\Essentials\\src\\Essentials.csproj",
"src\\Essentials\\test\\DeviceTests\\Essentials.DeviceTests.csproj",
"src\\Essentials\\test\\UnitTests\\Essentials.UnitTests.csproj",
"src\\Graphics\\src\\Graphics.Skia.GtkSharp\\Graphics.Skia.GtkSharp.csproj",
"src\\Graphics\\src\\Graphics.Skia.WPF\\Graphics.Skia.WPF.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Graphics.Win2D\\Graphics.Win2D.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\Graphics\\tests\\DeviceTests\\Graphics.DeviceTests.csproj",
"src\\Graphics\\tests\\Graphics.Benchmarks\\Graphics.Benchmarks.csproj",
"src\\Graphics\\tests\\Graphics.Tests\\Graphics.Tests.csproj",
"src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
"src\\TestUtils\\src\\DeviceTests.Runners.SourceGen\\TestUtils.DeviceTests.Runners.SourceGen.csproj",
"src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
"src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium.UITests\\TestUtils.Appium.UITests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium\\TestUtils.Appium.csproj",
"src\\TestUtils\\src\\TestUtils\\TestUtils.csproj"
]
}
}
2 changes: 1 addition & 1 deletion eng/devices/android.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ string DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ?
// optional
var USE_DOTNET = Argument("dotnet", true);
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-android" : ""));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? $"{dotnetVersion}-android" : ""));
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? "");
DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? "");
Expand Down
6 changes: 3 additions & 3 deletions eng/devices/catalyst.cake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#load "../cake/helpers.cake"
#load "../cake/dotnet.cake"

string TARGET = Argument("target", "Test");
Expand All @@ -10,7 +11,6 @@ FilePath PROJECT = Argument("project", EnvironmentVariable("MAC_TEST_PROJECT") ?
string TEST_DEVICE = Argument("device", EnvironmentVariable("MAC_TEST_DEVICE") ?? $"ios-simulator-64_{defaultVersion}"); // comma separated in the form <platform>-<device|simulator>[-<32|64>][_<version>] (eg: ios-simulator-64_13.4,[...])

// optional
var localDotnet = GetBuildVariable("workloads", "local") == "local";
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{dotnetVersion}-maccatalyst");
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("IOS_TEST_BINLOG") ?? "");
Expand Down Expand Up @@ -76,7 +76,7 @@ Task("uitest")
ArgumentCustomization = args => args
.Append($"-f {TARGET_FRAMEWORK}")
.Append("-t:Run")
.Append("/tl")
//.Append("/tl")
});
Information("Build UITests project {0}",PROJECT.FullPath);
Expand All @@ -87,7 +87,7 @@ Task("uitest")
ArgumentCustomization = args => args
.Append("/p:ExtraDefineConstants=MACUITEST")
.Append("/bl:" + binlog)
.Append("/tl")
//.Append("/tl")
});
SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_mac.log");
Expand Down
2 changes: 1 addition & 1 deletion eng/devices/windows.cake
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#load "../cake/helpers.cake"
#load "../cake/dotnet.cake"

string TARGET = Argument("target", "Test");
Expand All @@ -10,7 +11,6 @@ FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT
string TEST_DEVICE = Argument("device", EnvironmentVariable("WINDOWS_TEST_DEVICE") ?? $"");

// optional
var localDotnet = GetBuildVariable("workloads", "local") == "local";
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{dotnetVersion}-windows{defaultVersion}");
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("WINDOWS_TEST_BINLOG") ?? "");
Expand Down

0 comments on commit 2ddcc49

Please sign in to comment.