Commit dc1c2d1
committed
[bcl-tests] fixes for compilation on Windows
Context:
https://devdiv.visualstudio.com/DevDiv/_build/index?buildId=1047263
There are a couple fixes to get the BCL tests (and
Xamarin.Android-Tests.sln) compiling on Windows.
The `SystemUnzip` task is passing some file paths to
`Directory.EnumerateFiles`. Since it does not appear that this would
work; in general, it seems that `GetExtractedSourceEntries` should only
return directories as a simple fix to this problem.
Next, MSBuild is getting a duplicate `<Compile />` entry passed to `Csc`
for `obj/Debug/App.cs`. There was a conditional `<Compile />` entry as
well as one added during the `_GenerateApp_cs` task. It seems simpler to
just remove the condition and the duplicate `<Compile />` entry, since
`<BuildDependsOn />` causes the `_GenerateApp_cs` task to run first.1 parent 23b2642 commit dc1c2d1
File tree
3 files changed
+3
-6
lines changed- build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks
- tests/Xamarin.Android.Bcl-Tests
3 files changed
+3
-6
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
| 172 | + | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | 70 | | |
74 | 71 | | |
75 | 72 | | |
| |||
0 commit comments