Commit 9a50c66
[Mono.Posix] Mono.Posix.csproj fixes. (dotnet#64)
Building xamarin-android/master with Mono 4.4.0 [0] would result in a
build error within `src/Mono.Posix`:
CSC: error CS1703: An assembly `System.Runtime' with the same identity
has already been imported. Consider removing one of the references.
This was introduced by commit f2fed37, which added `System.Runtime`
as a `@(Reference)` to `Mono.Posix.csproj`.
`Mono.Posix.csproj` `<Import/>`s `Xamarin.Android.CSharp.targets`,
which indirectly adds `System.Runtime`, so there is no need for
`Mono.Posix.csproj` to directly refernce `System.Runtime`.
Additionally, `msbuild` is more stringent regarding property functions
and quoting: this resulted in an MSBuild error:
Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (:x86:'))">
The fix is to properly quote the `.Contains()` method parameters.
Finally, re-order various elements to increase consistency with other
projects, e.g. `@(Reference)` should go with other `@(Reference)`
entries, `Configuration.props` should be imported as early as
possible, `$(TargetFrameworkVersion)` should be set to
`$(AndroidFrameworkVersion)` (which requires the earlirer
`Configuration.props` import), etc.
[0]: mono-4.4.0-branch-c7-baseline/5995f741 parent 8d1aca3 commit 9a50c66
1 file changed
+11
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
16 | 21 | | |
17 | 22 | | |
18 | 23 | | |
| |||
53 | 58 | | |
54 | 59 | | |
55 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
56 | 65 | | |
57 | | - | |
58 | 66 | | |
59 | 67 | | |
60 | 68 | | |
| |||
237 | 245 | | |
238 | 246 | | |
239 | 247 | | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
| |||
259 | 259 | | |
260 | 260 | | |
261 | 261 | | |
262 | | - | |
| 262 | + | |
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
| |||
0 commit comments