Skip to content

Commit

Permalink
Merge pull request #326 from unoplatform/dev/nr/androidfirst
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel authored Oct 3, 2023
2 parents 2086f17 + 83f3051 commit dcdc371
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1439,19 +1439,19 @@
"cases": [
{
"condition": "(tfm == 'net7.0' && platforms == android && platforms == ios && platforms == maccatalyst)",
"value": "net7.0-ios;net7.0-android;net7.0-maccatalyst"
"value": "net7.0-android;net7.0-ios;net7.0-maccatalyst"
},
{
"condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms == maccatalyst)",
"value": "net8.0-ios;net8.0-android;net8.0-maccatalyst"
"value": "net8.0-android;net8.0-ios;net8.0-maccatalyst"
},
{
"condition": "(tfm == 'net7.0' && platforms == android && platforms == ios && platforms != maccatalyst)",
"value": "net7.0-ios;net7.0-android"
"value": "net7.0-android;net7.0-ios"
},
{
"condition": "(tfm == 'net8.0' && platforms == android && platforms == ios && platforms != maccatalyst)",
"value": "net8.0-ios;net8.0-android"
"value": "net8.0-android;net8.0-ios"
},
{
"condition": "(tfm == 'net7.0' && platforms != android && platforms == ios && platforms == maccatalyst)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,19 @@
"cases": [
{
"condition": "(tfm == 'net7.0' && useAndroid && useiOS && useMacCatalyst)",
"value": "net7.0-ios;net7.0-android;net7.0-maccatalyst"
"value": "net7.0-android;net7.0-ios;net7.0-maccatalyst"
},
{
"condition": "(tfm == 'net8.0' && useAndroid && useiOS && useMacCatalyst)",
"value": "net8.0-ios;net8.0-android;net8.0-maccatalyst"
"value": "net8.0-android;net8.0-ios;net8.0-maccatalyst"
},
{
"condition": "(tfm == 'net7.0' && useAndroid && useiOS && !useMacCatalyst)",
"value": "net7.0-ios;net7.0-android"
"value": "net7.0-android;net7.0-ios"
},
{
"condition": "(tfm == 'net8.0' && useAndroid && useiOS && !useMacCatalyst)",
"value": "net8.0-ios;net8.0-android"
"value": "net8.0-android;net8.0-ios"
},
{
"condition": "(tfm == 'net7.0' && !useAndroid && useiOS && useMacCatalyst)",
Expand Down

0 comments on commit dcdc371

Please sign in to comment.