This repository was archived by the owner on May 28, 2025. It is now read-only.
Commit 09802d4
committed
Redo timestamp file change to allow partial rebuilds. (#2311)
* Revert "Revert "Support partial rebuilds (right click build project in VS) for nuprojs. (#2300)""
This reverts commit 0added7.
* Fix previous implementation of creating the timestamp file at the beginning by
being more careful with project references between nuproj files and projects
pretending to be .nuprojs. The new implementation ensures that a .nuproj<->.nuproj
project reference is only evaluated in one configuration so that the timestamp file
creation doesn't happen more than once (happens once per conifg of .nuproj being built).
The full explanation of what was occuring is as follows:
A.nuproj -> B.nuproj -> NuprojInit.msbuildproj
|--------------^
In the Any CPU config the build order was as follows:
A.nuproj (Any CPU) -> B.nuproj (Any CPU) -> NuprojInit.msbuildproj (Any CPU)
| |
| |-> B.nuproj (x86)
| |-> B.nuproj (ARM)
|
|--> A.nuproj (x86)--> B.nuproj (x86) -> NuprojInit.msbuildproj (x86)
|--> A.nuproj (ARM)--> B.nuproj (ARM) -> NuprojInit.msbuildproj (ARM)
The new build order is:
A.nuproj (Any CPU) -> B.nuproj (Any CPU) -> NuprojInit.msbuildproj (Any CPU)
| |
| |-> B.nuproj (x86)
| |-> B.nuproj (ARM)
|
|--> A.nuproj (x86)
|--> A.nuproj (ARM)
The key difference being NuprojInit.msbuildproj only being built in the original
configuration. An additional benefit of this change is that B.nuproj will be rebuilt less.1 parent ef4940b commit 09802d4
File tree
16 files changed
+77
-171
lines changed- build
- WinObjC.Frameworks.Core
- WinObjC.Frameworks.UWP
- WinObjC.Frameworks
- common
- tools
- BuildMonitor
- BuildSupport
- Logging/dll
- VSIX
- WOCStdLib/dll
- WinObjC.Language
- legacy
- BuildMonitor
- ObjectiveC
- VSIX
16 files changed
+77
-171
lines changedLines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
64 | 68 | | |
65 | 69 | | |
| 70 | + | |
66 | 71 | | |
67 | 72 | | |
68 | 73 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
113 | 117 | | |
114 | 118 | | |
115 | 119 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
780 | 780 | | |
781 | 781 | | |
782 | 782 | | |
783 | | - | |
784 | | - | |
785 | 783 | | |
786 | 784 | | |
787 | 785 | | |
| |||
791 | 789 | | |
792 | 790 | | |
793 | 791 | | |
| 792 | + | |
| 793 | + | |
794 | 794 | | |
795 | 795 | | |
796 | 796 | | |
| |||
2287 | 2287 | | |
2288 | 2288 | | |
2289 | 2289 | | |
2290 | | - | |
2291 | | - | |
2292 | | - | |
2293 | | - | |
2294 | | - | |
2295 | | - | |
2296 | | - | |
2297 | | - | |
2298 | | - | |
2299 | | - | |
2300 | | - | |
2301 | | - | |
| 2290 | + | |
2302 | 2291 | | |
2303 | 2292 | | |
2304 | 2293 | | |
| |||
2311 | 2300 | | |
2312 | 2301 | | |
2313 | 2302 | | |
| 2303 | + | |
| 2304 | + | |
| 2305 | + | |
| 2306 | + | |
| 2307 | + | |
| 2308 | + | |
| 2309 | + | |
| 2310 | + | |
| 2311 | + | |
| 2312 | + | |
| 2313 | + | |
| 2314 | + | |
2314 | 2315 | | |
2315 | 2316 | | |
2316 | 2317 | | |
| |||
2671 | 2672 | | |
2672 | 2673 | | |
2673 | 2674 | | |
2674 | | - | |
2675 | 2675 | | |
| 2676 | + | |
2676 | 2677 | | |
2677 | 2678 | | |
Lines changed: 8 additions & 27 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 13 | | |
30 | 14 | | |
31 | 15 | | |
32 | | - | |
| 16 | + | |
33 | 17 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | 18 | | |
39 | 19 | | |
40 | 20 | | |
41 | | - | |
42 | 21 | | |
| 22 | + | |
43 | 23 | | |
44 | 24 | | |
45 | 25 | | |
46 | 26 | | |
47 | 27 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
53 | 33 | | |
| 34 | + | |
54 | 35 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | 39 | | |
75 | 40 | | |
76 | 41 | | |
| |||
88 | 53 | | |
89 | 54 | | |
90 | 55 | | |
91 | | - | |
92 | 56 | | |
93 | 57 | | |
94 | 58 | | |
95 | 59 | | |
96 | | - | |
| 60 | + | |
97 | 61 | | |
98 | 62 | | |
99 | 63 | | |
| |||
104 | 68 | | |
105 | 69 | | |
106 | 70 | | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | 71 | | |
| 72 | + | |
115 | 73 | | |
116 | 74 | | |
117 | 75 | | |
| |||
136 | 94 | | |
137 | 95 | | |
138 | 96 | | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
139 | 105 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | | - | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | 46 | | |
53 | 47 | | |
54 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
0 commit comments