[net9.0] Merge main to net9.0 #22840
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove .NET 7 from bug template * Update bug-report.yml * Update bug-report.yml
* Make sure the package source mapping is correct * Update NuGet.config * Update NuGet.config * Update NuGet.config * skia * Update NuGet.config * Make things a bit better, maybe * Update NuGet.config * things * version placeholders * Update NuGet.config
I used to do this to build MAUI:
* `dotnet cake`
* `./bin/dotnet/dotnet build SomeCustomerProject.csproj`
Unfortunately, the `dotnet build` command would give an error
that the MAUI workload was not installed.
The `Microsoft.Maui.Sdk` project is copying its output to:
OutputPath = artifacts/bin/Microsoft.Maui.Sdk/Debug/
When it should be:
OutputPath = bin/dotnet/packs/Microsoft.Maui.Sdk/8.0.60-dev/
This appears to be caused by the migration to dotnet/arcade:
https://github.com/dotnet/arcade/blob/e6b3f32f9855dccbe2447471c8f729b66f17d242/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectLayout.props#L14
To fix this, I added a new target to copy files to an additional location.
After this change, I still got a warning:
warning NU1603: hellomaui depends on Microsoft.Maui.Controls (>= 8.0.60-dev) but Microsoft.Maui.Controls 8.0.60-dev was not found. An approximate best match of Microsoft.Maui.Controls 8.0.60-dev.24303.1 was resolved.
But will troubleshoot that one later, the `.nupkg` files in
`./bin/dotnet/library-packs/`, have a 8.0.60-dev.24303.1 version.
…40527.1 (#22791) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24270.4 -> To Version 9.0.0-prerelease.24277.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Added some additional testing assets to sandbox * Do more sample things
* Reduce the number of calls to invalidate measure * Added UITest * - add screen shot * Updated tests validating more Label updates * Updated snapshot --------- Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Fixing _loaded event firing logic * Added a unit test for checking a raising count of page Loaded/UnLoaded events * - add test and fix code to maintain initial intent --------- Co-authored-by: Rafal Kukla <rafal.kukla@tietoevry.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
If you try to F5 the Windows device tests, you'll get an error:
Error (active) APPX1101 Payload contains two or more files with the same destination path 'xunit.runner.utility.netcoreapp10.dll'. Source files:
...\Microsoft.Maui.Cache\NuGet\packages\xunit.runner.visualstudio\2.8.0\build\net6.0\xunit.runner.utility.netcoreapp10.dll
...\Microsoft.Maui.Cache\NuGet\packages\xunit.runner.utility\2.6.6\lib\netcoreapp1.0\xunit.runner.utility.netcoreapp10.dll Controls.DeviceTests (net8.0-windows10.0.19041.0)
...\Microsoft.Maui.Cache\NuGet\packages\microsoft.windowsappsdk\1.5.240311000\buildTransitive\Microsoft.Build.Msix.Packaging.targets
This is due to dotnet/arcade using:
https://github.com/dotnet/arcade/blob/2c08708d18855f2e2779ac5d0623a5978751c4f3/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnit/XUnit.targets#L13
For now, let's set `$(DisableArcadeTestFramework)` and it won't import
`XUnit.targets` from arcade.
After these changes, I can F5 again.
# Conflicts: # NuGet.config # eng/Version.Details.xml # src/Controls/src/Core/Interactivity/EventTrigger.cs # src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
rmarinho
added
the
area-infrastructure
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Bring latest changes from main to net9 branch