Skip to content

Commit 955d30c

Browse files
committed
Review property renames
- Removing underscore from public facing properties. ***NO_CI***
1 parent 06419de commit 955d30c

3 files changed

Lines changed: 24 additions & 23 deletions

File tree

SDK props and targets renaming.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,14 @@ renames are local — except the external contracts listed in "Do NOT rename" be
6060
| `NFMDP_PE_Verbose` | `NanoMdpVerbose` |
6161
| `NFMDP_PE_VerboseMinimize` | `NanoMdpVerboseMinimize` |
6262

63-
**C2 — internal switches (driven by `NanoIsCoreLibrary`, core-assembly mechanics) → `_NanoMdp…`:**
63+
**C2 — public project-file switches:**
6464

6565
| Current | Proposed |
6666
|---|---|
67-
| `NFMDP_GENERATE_PE` | `_NanoMdpGeneratePe` |
68-
| `NFMDP_DUMP_METADATA` | `_NanoMdpDumpMetadata` |
69-
| `NFMDP_GENERATE_STUBS` | `_NanoMdpGenerateStubs` |
70-
| `NFMDP_DAT_FILES` | `_NanoMdpGenerateDatFiles` |
71-
| `NFMDP_XML_FILES` | `_NanoMdpGenerateXmlFiles` |
67+
| `_NanoMdpDumpMetadata` | `NanoMdpDumpMetadata` |
68+
| `_NanoMdpGenerateStubs` | `NanoMdpGenerateStubs` |
69+
| `_NanoMdpGenerateDatFiles` | `NanoMdpGenerateDatFiles` |
70+
| `_NanoMdpGenerateXmlFiles` | `NanoMdpGenerateXmlFiles` |
7271

7372
**C3 — internal core-assembly path computations + stub params → `_NanoMdp…` / `_NanoMdpStub…`:**
7473

@@ -161,7 +160,8 @@ Same shape for `NanoMdpVerboseMinimize` ← `NFMDP_PE_VerboseMinimize`, `NanoMdp
161160

162161
All under [nanoFramework.NET.Sdk/Sdk/](nanoFramework.NET.Sdk/Sdk/):
163162
`Sdk.props`, `Sdk.targets`, `nanoFramework.Tfm.props`, `nanoFramework.Mdp.targets`,
164-
`nanoFramework.Output.targets`, `nanoFramework.Resources.targets`. (`nanoFramework.Capabilities.targets`
163+
`nanoFramework.Output.targets`, `nanoFramework.Resources.targets`. `test/SmokeTest/SmokeTest.csproj`
164+
was also updated to use the public `NanoMdpGenerateStubs` name. (`nanoFramework.Capabilities.targets`
165165
needs no change — its symbols are all the fixed CPS contract.) Update the explanatory header
166166
comments that mention the old names (e.g. the `_NfSdkTasksDir` / `NanoFramework_*` / `_NfMdpTasksTFM`
167167
references in the Sdk.targets and Mdp.targets banners).

nanoFramework.NET.Sdk/Sdk/nanoFramework.Mdp.targets

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
1919
Holds:
2020
- the auto-injected MDP PackageReference + NanoMdpVersion default,
21-
- the MDP property defaults (verbosity, NanoIsCoreLibrary-driven switches),
21+
- the MDP property defaults (verbosity, public NanoMdp* knobs, and
22+
NanoIsCoreLibrary-driven internal switches),
2223
- the _NanoMdpTasksTfm / task-DLL resolution and UsingTask declarations,
2324
- the single GenerateNanoPeFile target that emits the .pe / .pdbx (and, for
2425
core assemblies, the stubs / dump-exports / dependency-map / strings).
@@ -78,16 +79,16 @@
7879
<!-- in a targets-time module (after Sdk.props). -->
7980
<!-- ============================================================ -->
8081
<PropertyGroup Condition="'$(NanoIsCoreLibrary)' == 'True'">
81-
<_NanoMdpDumpMetadata Condition="'$(_NanoMdpDumpMetadata)' == ''">true</_NanoMdpDumpMetadata>
82-
<_NanoMdpGenerateStubs Condition="'$(_NanoMdpGenerateStubs)' == ''">true</_NanoMdpGenerateStubs>
83-
<_NanoMdpGenerateDatFiles Condition="'$(_NanoMdpGenerateDatFiles)' == ''">true</_NanoMdpGenerateDatFiles>
84-
<_NanoMdpGenerateXmlFiles Condition="'$(_NanoMdpGenerateXmlFiles)' == ''">true</_NanoMdpGenerateXmlFiles>
82+
<NanoMdpDumpMetadata Condition="'$(NanoMdpDumpMetadata)' == ''">true</NanoMdpDumpMetadata>
83+
<NanoMdpGenerateStubs Condition="'$(NanoMdpGenerateStubs)' == ''">true</NanoMdpGenerateStubs>
84+
<NanoMdpGenerateDatFiles Condition="'$(NanoMdpGenerateDatFiles)' == ''">true</NanoMdpGenerateDatFiles>
85+
<NanoMdpGenerateXmlFiles Condition="'$(NanoMdpGenerateXmlFiles)' == ''">true</NanoMdpGenerateXmlFiles>
8586
</PropertyGroup>
8687
<PropertyGroup Condition="'$(NanoIsCoreLibrary)' != 'True'">
87-
<_NanoMdpDumpMetadata Condition="'$(_NanoMdpDumpMetadata)' == ''">false</_NanoMdpDumpMetadata>
88-
<_NanoMdpGenerateStubs Condition="'$(_NanoMdpGenerateStubs)' == ''">false</_NanoMdpGenerateStubs>
89-
<_NanoMdpGenerateDatFiles Condition="'$(_NanoMdpGenerateDatFiles)' == ''">false</_NanoMdpGenerateDatFiles>
90-
<_NanoMdpGenerateXmlFiles Condition="'$(_NanoMdpGenerateXmlFiles)' == ''">false</_NanoMdpGenerateXmlFiles>
88+
<NanoMdpDumpMetadata Condition="'$(NanoMdpDumpMetadata)' == ''">false</NanoMdpDumpMetadata>
89+
<NanoMdpGenerateStubs Condition="'$(NanoMdpGenerateStubs)' == ''">false</NanoMdpGenerateStubs>
90+
<NanoMdpGenerateDatFiles Condition="'$(NanoMdpGenerateDatFiles)' == ''">false</NanoMdpGenerateDatFiles>
91+
<NanoMdpGenerateXmlFiles Condition="'$(NanoMdpGenerateXmlFiles)' == ''">false</NanoMdpGenerateXmlFiles>
9192
</PropertyGroup>
9293

9394
<!-- ============================================================ -->
@@ -157,7 +158,7 @@
157158
<_NanoMdpCompileOutput>$(_NanoIntermediateAssembly).pe</_NanoMdpCompileOutput>
158159
<_NanoMdpCompileOutputNoExt>$(_NanoIntermediateAssembly)</_NanoMdpCompileOutputNoExt>
159160

160-
<!-- Stub/skeleton inputs (consumed by the task only when _NanoMdpGenerateStubs == true) -->
161+
<!-- Stub/skeleton inputs (consumed by the task only when NanoMdpGenerateStubs == true) -->
161162
<_NanoMdpStubSkeletonProject Condition="'$(_NanoMdpStubSkeletonProject)' == ''">$(NanoGenerateSkeletonProjectName)</_NanoMdpStubSkeletonProject>
162163
<_NanoMdpStubSkeletonName Condition="'$(_NanoMdpStubSkeletonName)' == ''">$(NanoGenerateStubsRootName)</_NanoMdpStubSkeletonName>
163164
<_NanoMdpStubSkeletonFile Condition="'$(_NanoMdpStubSkeletonFile)' == ''">$(NanoGenerateSkeletonFile)</_NanoMdpStubSkeletonFile>
@@ -181,7 +182,7 @@
181182
header triggers a re-run even when .pe/.pdbx are up-to-date. Empty when stubs
182183
are disabled, so MSBuild ignores it for non-stub projects. -->
183184
<PropertyGroup>
184-
<_NanoMdpStubMainHeader Condition="'$(_NanoMdpGenerateStubs)' == 'true'">$(_NanoMdpStubSkeletonFile)\$(NanoGenerateStubsRootName).h</_NanoMdpStubMainHeader>
185+
<_NanoMdpStubMainHeader Condition="'$(NanoMdpGenerateStubs)' == 'true'">$(_NanoMdpStubSkeletonFile)\$(NanoGenerateStubsRootName).h</_NanoMdpStubMainHeader>
185186
</PropertyGroup>
186187

187188
<!-- ============================================================ -->
@@ -221,11 +222,11 @@
221222
Parse="$(_NanoMdpParseInput)"
222223
IsCoreLibrary="$(NanoIsCoreLibrary)"
223224
Compile="$(_NanoMdpCompileOutput)"
224-
DumpMetadata="$(_NanoMdpDumpMetadata)"
225+
DumpMetadata="$(NanoMdpDumpMetadata)"
225226
DumpExports="$(_NanoMdpDumpExportsFile)"
226227
GenerateDependency="$(_NanoMdpDependencyMapFile)"
227228
SaveStrings="$(_NanoMdpSaveStringsFile)"
228-
GenerateStubs="$(_NanoMdpGenerateStubs)"
229+
GenerateStubs="$(NanoMdpGenerateStubs)"
229230
GenerateSkeletonFile="$(_NanoMdpStubSkeletonFile)"
230231
GenerateSkeletonName="$(_NanoMdpStubSkeletonName)"
231232
GenerateSkeletonProject="$(_NanoMdpStubSkeletonProject)"
@@ -284,8 +285,8 @@
284285
<!-- .dat artifact is still required for the core build, and -->
285286
<!-- which MDP parameter emits it, must be confirmed against the -->
286287
<!-- MDP task contract + the external mscorlib build before a -->
287-
<!-- step is re-added here. _NanoMdpGenerateDatFiles / -->
288-
<!-- _NanoMdpGenerateXmlFiles remain defined above as the future -->
288+
<!-- step is re-added here. NanoMdpGenerateDatFiles / -->
289+
<!-- NanoMdpGenerateXmlFiles remain defined above as the future -->
289290
<!-- toggles for that work. -->
290291
<!-- ============================================================ -->
291292

test/SmokeTest/SmokeTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<_NanoMdpGenerateStubs>true</_NanoMdpGenerateStubs>
11+
<NanoMdpGenerateStubs>true</NanoMdpGenerateStubs>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)