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.

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

Move Microsoft.Maui.Samples.slnf to eng folder #27033

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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",
Expand Down
2 changes: 1 addition & 1 deletion eng/cake/dotnet.cake
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Task("dotnet-samples")
}
else
{
projectsToBuild = "./Microsoft.Maui.Samples.slnf";
projectsToBuild = "./eng/Microsoft.Maui.Samples.slnf";
}

RunMSBuildWithDotNet(projectsToBuild, properties, binlogPrefix: "sample-");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<SolutionFile>(File.ReadAllText(sampleSln));
foreach (var projectFile in slnFile?.solution.projects ?? new List<string> { sampleSln })
{
Expand Down
4 changes: 2 additions & 2 deletions src/Workload/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading