From fb8ebd17e2abb4feefe1c800cae5ad0c43c7ae49 Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Thu, 9 Jan 2025 13:54:43 +0100 Subject: [PATCH 1/3] Move Microsoft.Maui.Samples.slnf to eng folder --- .../Microsoft.Maui.Samples.slnf | 0 eng/cake/dotnet.cake | 2 +- .../src/Microsoft.Maui.IntegrationTests/SampleTests.cs | 2 +- src/Workload/README.md | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename Microsoft.Maui.Samples.slnf => eng/Microsoft.Maui.Samples.slnf (100%) diff --git a/Microsoft.Maui.Samples.slnf b/eng/Microsoft.Maui.Samples.slnf similarity index 100% rename from Microsoft.Maui.Samples.slnf rename to eng/Microsoft.Maui.Samples.slnf diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 5428709c90c3..c8fa8f758627 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -203,7 +203,7 @@ Task("dotnet-samples") } else { - projectsToBuild = "./Microsoft.Maui.Samples.slnf"; + projectsToBuild = "./eng/Microsoft.Maui.Samples.slnf"; } RunMSBuildWithDotNet(projectsToBuild, properties, binlogPrefix: "sample-"); diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SampleTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SampleTests.cs index 5050198ba498..bea502ca20c8 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SampleTests.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SampleTests.cs @@ -12,7 +12,7 @@ public static IEnumerable SampleTestMatrix get { // Parse individual project files from `Microsoft.Maui.Samples.slnf` to generate a set of test cases - var sampleSln = Path.Combine(TestEnvironment.GetMauiDirectory(), "Microsoft.Maui.Samples.slnf"); + var sampleSln = Path.Combine(TestEnvironment.GetMauiDirectory(), "eng", "Microsoft.Maui.Samples.slnf"); var slnFile = JsonConvert.DeserializeObject(File.ReadAllText(sampleSln)); foreach (var projectFile in slnFile?.solution.projects ?? new List { sampleSln }) { diff --git a/src/Workload/README.md b/src/Workload/README.md index fac19af3af5e..d559de290250 100644 --- a/src/Workload/README.md +++ b/src/Workload/README.md @@ -134,7 +134,7 @@ declared: ```dotnetcli $ git clean -dxf src/Controls/samples/ -$ ./bin/dotnet/dotnet build Microsoft.Maui.Samples.slnf -p:UseWorkload=true +$ ./bin/dotnet/dotnet build ./eng/Microsoft.Maui.Samples.slnf -p:UseWorkload=true ``` ### Install System-Wide @@ -177,7 +177,7 @@ $ ./bin/dotnet/dotnet build src/DotNet/DotNet.csproj -t:Install Then we can build samples with `-p:UseWorkload=true`: ```dotnetcli -$ ./bin/dotnet/dotnet build Microsoft.Maui.Samples.slnf -p:UseWorkload=true +$ ./bin/dotnet/dotnet build ./eng/Microsoft.Maui.Samples.slnf -p:UseWorkload=true ``` ## Cleanup .NET 6 installs & workloads From e00507fa30333a142ff7dddb04390d5b4ff582fd Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Thu, 9 Jan 2025 13:58:58 +0100 Subject: [PATCH 2/3] Update paths in slnfs --- eng/Microsoft.Maui.Samples.slnf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Microsoft.Maui.Samples.slnf b/eng/Microsoft.Maui.Samples.slnf index 9546d065fe74..afd07a8da5d7 100644 --- a/eng/Microsoft.Maui.Samples.slnf +++ b/eng/Microsoft.Maui.Samples.slnf @@ -1,12 +1,12 @@ { "solution": { - "path": "Microsoft.Maui.sln", + "path": "..\\Microsoft.Maui.sln", "projects": [ - "src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj", - "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", - "src\\Controls\\tests\\TestCases.HostApp\\Controls.TestCases.HostApp.csproj", - "src\\Controls\\samples\\Controls.Sample.Embedding\\Maui.Controls.Sample.Embedding.csproj", - "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj" + "..\\src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj", + "..\\src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", + "..\\src\\Controls\\tests\\TestCases.HostApp\\Controls.TestCases.HostApp.csproj", + "..\\src\\Controls\\samples\\Controls.Sample.Embedding\\Maui.Controls.Sample.Embedding.csproj", + "..\\src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj" ] } } \ No newline at end of file From e9707ff76b38d58564f6c0599772c6aa570b9bab Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Thu, 9 Jan 2025 14:21:04 +0100 Subject: [PATCH 3/3] Update Microsoft.Maui.Samples.slnf --- eng/Microsoft.Maui.Samples.slnf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Microsoft.Maui.Samples.slnf b/eng/Microsoft.Maui.Samples.slnf index afd07a8da5d7..0e4173ea4513 100644 --- a/eng/Microsoft.Maui.Samples.slnf +++ b/eng/Microsoft.Maui.Samples.slnf @@ -2,11 +2,11 @@ "solution": { "path": "..\\Microsoft.Maui.sln", "projects": [ - "..\\src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj", - "..\\src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", - "..\\src\\Controls\\tests\\TestCases.HostApp\\Controls.TestCases.HostApp.csproj", - "..\\src\\Controls\\samples\\Controls.Sample.Embedding\\Maui.Controls.Sample.Embedding.csproj", - "..\\src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj" + "src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj", + "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", + "src\\Controls\\tests\\TestCases.HostApp\\Controls.TestCases.HostApp.csproj", + "src\\Controls\\samples\\Controls.Sample.Embedding\\Maui.Controls.Sample.Embedding.csproj", + "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj" ] } } \ No newline at end of file