-
Notifications
You must be signed in to change notification settings - Fork 516
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[xharness] Automatically inline Imports to a "shared.csproj" when clo…
…ning projects. Fixes #12316 and #12277. (#12322) This way we process the shared.csproj that we use in our .NET test projects. The main effect is that we'll clone any project references included in the shared.csproj, which will fix #12316. On another hand, it means that we'll add/remove defines in referenced projects, which fixes #12277. It also allows us to put more code in the "shared.csproj" files. Fixes #12316. Fixes #12277.
- Loading branch information
1 parent
142e717
commit a91e34f
Showing
23 changed files
with
387 additions
and
67 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<!-- This file is not processed by xharness, and contains logic shared by all our test suites --> | ||
<Project> | ||
<!-- Logic for iOS --> | ||
<PropertyGroup Condition="$(TargetFramework.EndsWith('-ios'))"> | ||
<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback> | ||
</PropertyGroup> | ||
<ItemGroup Condition="'$(_PlatformName)' == 'iOS'"> | ||
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" /> | ||
</ItemGroup> | ||
|
||
<!-- Logic for tvOS --> | ||
<PropertyGroup Condition="$(TargetFramework.EndsWith('-tvos'))"> | ||
<DefineConstants>$(DefineConstants);XAMCORE_3_0</DefineConstants> | ||
<AssetTargetFallback>xamarintvos10;$(AssetTargetFallback)</AssetTargetFallback> | ||
</PropertyGroup> | ||
<ItemGroup Condition="$(TargetFramework.EndsWith('-tvos'))"> | ||
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" /> | ||
</ItemGroup> | ||
|
||
<!-- Logic for macOS --> | ||
<PropertyGroup Condition="$(TargetFramework.EndsWith('-macos'))"> | ||
<DefineConstants>$(DefineConstants);MONOMAC</DefineConstants> | ||
</PropertyGroup> | ||
|
||
<!-- Logic for Mac Catalyst --> | ||
<PropertyGroup Condition="$(TargetFramework.EndsWith('-maccatalyst'))"> | ||
<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback> | ||
</PropertyGroup> | ||
|
||
<!-- Logic for all test suites --> | ||
</Project> |
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
a91e34f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❌ [CI Build] Tests failed on Build ❌
Tests failed on Build.
API diff
✅ API Diff from stable
View API diff
API & Generator diff
✅ API Diff (from PR only) (no change)
✅ Generator Diff (only version changes)
Packages generated
View packages
Test results
1 tests failed, 224 tests passed.
Failed tests
Pipeline on Agent XAMBOT-1038.BigSur'
[xharness] Automatically inline Imports to a "shared.csproj" when cloning projects. Fixes #12316 and #12277. (#12322)
a91e34f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.
Pipeline on Agent
[xharness] Automatically inline Imports to a "shared.csproj" when cloning projects. Fixes #12316 and #12277. (#12322)
a91e34f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.
Pipeline on Agent
[xharness] Automatically inline Imports to a "shared.csproj" when cloning projects. Fixes #12316 and #12277. (#12322)
a91e34f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❌ Tests failed on macOS M1 - Mac Big Sur (11.5) ❌
Tests failed on M1 - Mac Big Sur (11.5).
Failed tests are:
Pipeline on Agent
[xharness] Automatically inline Imports to a "shared.csproj" when cloning projects. Fixes #12316 and #12277. (#12322)
a91e34f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Tests passed on macOS Mac Mojave (10.14) ✅
Tests passed
All tests on macOS X Mac Mojave (10.14) passed.
Pipeline on Agent
[xharness] Automatically inline Imports to a "shared.csproj" when cloning projects. Fixes #12316 and #12277. (#12322)