diff --git a/README.md b/README.md
index a9338a1..83b2c1d 100644
--- a/README.md
+++ b/README.md
@@ -47,10 +47,16 @@ Or pin the SDK version in `global.json`:
 
 ```
 src/
-  nanoFramework.Sdk/           SDK NuGet package (Sdk.props / Sdk.targets)
+  nanoFramework.NET.Sdk/           SDK NuGet package (Sdk.props / Sdk.targets)
   nanoFramework.Tools.BuildTasks/  Custom MSBuild tasks (resource gen, binary output, etc.)
 ```
 
+## Tools
+
+The `dotnet nano` umbrella CLI and the `nano-migrate` project migrator (with the companion
+SDK-migration skill) live in the [nanoframework/nf-tools](https://github.com/nanoframework/nf-tools)
+repository, under `tools/nano` and `tools/migrate`.
+
 ## Development
 
 ```bash
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eada5eb..3243f19 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,177 +41,207 @@ stages:
 ########################
 - stage: Build
   jobs:
-    - job: Build_SDK
-      pool:
-        vmImage: 'windows-latest'
-
-      variables:
-        - group: sign-client-credentials
-        - name: buildPlatform
-          value: 'Any CPU'  
-        - name: buildConfiguration
-          value: 'Release'
-        - name: solution
-          value: 'nanoFramework.NET.Sdk.sln'
-
-      steps:
-      - checkout: self
-        submodules: true
-        fetchDepth: 0
-
-      - script: |
-          git config --global user.email nanoframework@outlook.com
-          git config --global user.name nfbot
-          git config --global core.autocrlf true
-        displayName: Setup git identity
-
-      - template: install-nbgv-tool.yml@templates
-
-      # waiting for project to be public to enable SonarCloud analysis
-      # - task: SonarCloudPrepare@3
-      #   condition: >-
-      #     and(
-      #       succeeded(),
-      #       eq(variables['StartReleaseCandidate'], false),
-      #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
-      #       not(${{ parameters.skipSonarCloudAnalysis }})
-      #     )
-      #   displayName: 'Prepare analysis on SonarCloud'
-      #   inputs:
-      #     SonarCloud: 'sonarcloud-$(System.TeamProject)'
-      #     organization: 'nanoframework'
-      #     scannerMode: 'dotnet'
-      #     projectKey: 'nanoframework_net-sdk'
-      #     extraProperties: |
-      #       sonar.exclusions=**/obj/**,**/*.dll
-      #       sonar.cs.vscoveragexml.reportsPaths=$(Agent.TempDirectory)/**/**.coverage
-      #       sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)/**/**.trx
-      #       sonar.scanner.skipJreProvisioning=true
-
-      - template: install-nuget.yml@templates
-
-      - task: DotNetCoreCLI@2
-        displayName: Build
-        inputs:
-          command: 'build'
-          projects: '$(solution)'
-          arguments: '--configuration $(buildConfiguration) /p:PublicRelease=true'
-
-      # waiting for project to be public to enable SonarCloud analysis
-      # - task: SonarCloudAnalyze@3
-      #   condition: >-
-      #     and(
-      #       succeeded(),
-      #       eq(variables['StartReleaseCandidate'], false),
-      #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-      #     )
-      #   displayName: 'Run Code Analysis'
-      #   continueOnError: true
-
-      # waiting for project to be public to enable SonarCloud analysis
-      # - task: SonarCloudPublish@3
-      #   condition: >-
-      #     and(
-      #       succeeded(),
-      #       eq(variables['StartReleaseCandidate'], false),
-      #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-      #     )
-      #   displayName: 'Publish Quality Gate Result'
-      #   continueOnError: true
-
-      - task: DotNetCoreCLI@2
-        displayName: Install Sign Client CLI
-        condition: >-
-          and(
-            succeeded(),
-            eq(variables['StartReleaseCandidate'], false),
-            not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-          )
-        inputs:
-          command: custom
-          custom: tool
-          arguments: install --tool-path . sign --version 0.9.1-beta.23530.1
-
-      - pwsh: |
-          .\sign code azure-key-vault `
-          "**/nanoFramework.Tools.BuildTasks.*" `
-          --base-directory "$(Build.SourcesDirectory)/nanoFramework.NET.Sdk/build/Release" `
-          --description "$(Build.Repository.Name)" `
-          --description-url "https://github.com/$(Build.Repository.Name)" `
-          --azure-key-vault-tenant-id "$(SignTenantId)" `
-          --azure-key-vault-client-id "$(SignClientId)" `
-          --azure-key-vault-client-secret "$(SignClientSecret)" `
-          --azure-key-vault-certificate "$(SignKeyVaultCertificate)" `
-          --azure-key-vault-url "$(SignKeyVaultUrl)" `
-          --timestamp-url http://timestamp.digicert.com
-        displayName: Sign DLLs
-        continueOnError: false
-        condition: >-
-          and(
-            succeeded(),
-            eq(variables['StartReleaseCandidate'], false),
-            not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-          )
+  - job: Build_SDK
+    pool:
+      vmImage: 'windows-latest'
 
-      - task: DotNetCoreCLI@2
-        displayName: Pack
-        inputs:
-          command: 'pack'
-          packagesToPack: '**/src/nanoFramework.NET.Sdk.csproj'
-          versioningScheme: 'off'
-          arguments: '--configuration $(buildConfiguration) /p:PublicRelease=true --output $(Build.ArtifactStagingDirectory)'
-
-      - pwsh: |
-          .\sign code azure-key-vault `
-          "**/*.nupkg" `
-          --base-directory "$(Build.ArtifactStagingDirectory)" `
-          --description "$(Build.Repository.Name)" `
-          --description-url "https://github.com/$(Build.Repository.Name)" `
-          --azure-key-vault-tenant-id "$(SignTenantId)" `
-          --azure-key-vault-client-id "$(SignClientId)" `
-          --azure-key-vault-client-secret "$(SignClientSecret)" `
-          --azure-key-vault-certificate "$(SignKeyVaultCertificate)" `
-          --azure-key-vault-url "$(SignKeyVaultUrl)" `
-          --timestamp-url http://timestamp.digicert.com
-        displayName: Sign NuGet package
-        continueOnError: true
-        condition: >-
-          and(
-            succeeded(),
-            eq(variables['StartReleaseCandidate'], false),
-            not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
-          )
+    variables:
+      - group: sign-client-credentials
+      - name: buildPlatform
+        value: 'Any CPU'  
+      - name: buildConfiguration
+        value: 'Release'
+      - name: solution
+        value: 'nanoFramework.NET.Sdk.sln'
+
+    steps:
+    - checkout: self
+      submodules: true
+      fetchDepth: 0
+
+    - script: |
+        git config --global user.email nanoframework@outlook.com
+        git config --global user.name nfbot
+        git config --global core.autocrlf true
+      displayName: Setup git identity
+
+    - template: install-nbgv-tool.yml@templates
+
+    # waiting for project to be public to enable SonarCloud analysis
+    # - task: SonarCloudPrepare@3
+    #   condition: >-
+    #     and(
+    #       succeeded(),
+    #       eq(variables['StartReleaseCandidate'], false),
+    #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
+    #       not(${{ parameters.skipSonarCloudAnalysis }})
+    #     )
+    #   displayName: 'Prepare analysis on SonarCloud'
+    #   inputs:
+    #     SonarCloud: 'sonarcloud-$(System.TeamProject)'
+    #     organization: 'nanoframework'
+    #     scannerMode: 'dotnet'
+    #     projectKey: 'nanoframework_net-sdk'
+    #     extraProperties: |
+    #       sonar.exclusions=**/obj/**,**/*.dll
+    #       sonar.cs.vscoveragexml.reportsPaths=$(Agent.TempDirectory)/**/**.coverage
+    #       sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)/**/**.trx
+    #       sonar.scanner.skipJreProvisioning=true
 
-      - task: PublishPipelineArtifact@1
-        displayName: Publish NuGet package
-        inputs:
-          targetPath: '$(Build.ArtifactStagingDirectory)'
-          artifactName: 'NuGetPackage'
-          artifactType: 'pipeline'
-      
-      - task: NuGetCommand@2
-        condition: >-
-          and(
-            succeeded(),
-            eq(variables['System.PullRequest.PullRequestId'], ''),
-            not(startsWith(variables['Build.SourceBranch'], 'refs/pull/')),
-            eq(variables['StartReleaseCandidate'], false),
-            not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    - template: install-nuget.yml@templates
+
+    - task: DotNetCoreCLI@2
+      displayName: Build
+      inputs:
+        command: 'build'
+        projects: '$(solution)'
+        arguments: '--configuration $(buildConfiguration) /p:PublicRelease=true'
+
+    # waiting for project to be public to enable SonarCloud analysis
+    # - task: SonarCloudAnalyze@3
+    #   condition: >-
+    #     and(
+    #       succeeded(),
+    #       eq(variables['StartReleaseCandidate'], false),
+    #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    #     )
+    #   displayName: 'Run Code Analysis'
+    #   continueOnError: true
+
+    # waiting for project to be public to enable SonarCloud analysis
+    # - task: SonarCloudPublish@3
+    #   condition: >-
+    #     and(
+    #       succeeded(),
+    #       eq(variables['StartReleaseCandidate'], false),
+    #       not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    #     )
+    #   displayName: 'Publish Quality Gate Result'
+    #   continueOnError: true
+
+    - task: DotNetCoreCLI@2
+      displayName: Install Sign Client CLI
+      condition: >-
+        and(
+          succeeded(),
+          eq(variables['StartReleaseCandidate'], false),
+          not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+        )
+      inputs:
+        command: custom
+        custom: tool
+        arguments: install --tool-path . sign --version 0.9.1-beta.23530.1
+
+    - pwsh: |
+        .\sign code azure-key-vault `
+        "**/nanoFramework.Tools.BuildTasks.*" `
+        --base-directory "$(Build.SourcesDirectory)/nanoFramework.NET.Sdk/build/Release" `
+        --description "$(Build.Repository.Name)" `
+        --description-url "https://github.com/$(Build.Repository.Name)" `
+        --azure-key-vault-tenant-id "$(SignTenantId)" `
+        --azure-key-vault-client-id "$(SignClientId)" `
+        --azure-key-vault-client-secret "$(SignClientSecret)" `
+        --azure-key-vault-certificate "$(SignKeyVaultCertificate)" `
+        --azure-key-vault-url "$(SignKeyVaultUrl)" `
+        --timestamp-url http://timestamp.digicert.com
+      displayName: Sign DLLs
+      continueOnError: false
+      condition: >-
+        and(
+          succeeded(),
+          eq(variables['StartReleaseCandidate'], false),
+          not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+        )
+
+    - task: DotNetCoreCLI@2
+      displayName: Pack
+      inputs:
+        command: 'pack'
+        packagesToPack: '**/src/nanoFramework.NET.Sdk.csproj'
+        versioningScheme: 'off'
+        arguments: '--configuration $(buildConfiguration) /p:PublicRelease=true --output $(Build.ArtifactStagingDirectory)'
+
+    - pwsh: |
+        .\sign code azure-key-vault `
+        "**/*.nupkg" `
+        --base-directory "$(Build.ArtifactStagingDirectory)" `
+        --description "$(Build.Repository.Name)" `
+        --description-url "https://github.com/$(Build.Repository.Name)" `
+        --azure-key-vault-tenant-id "$(SignTenantId)" `
+        --azure-key-vault-client-id "$(SignClientId)" `
+        --azure-key-vault-client-secret "$(SignClientSecret)" `
+        --azure-key-vault-certificate "$(SignKeyVaultCertificate)" `
+        --azure-key-vault-url "$(SignKeyVaultUrl)" `
+        --timestamp-url http://timestamp.digicert.com
+      displayName: Sign NuGet package
+      continueOnError: true
+      condition: >-
+        and(
+          succeeded(),
+          eq(variables['StartReleaseCandidate'], false),
+          not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+        )
+
+    - task: PublishPipelineArtifact@1
+      displayName: Publish NuGet package
+      inputs:
+        targetPath: '$(Build.ArtifactStagingDirectory)'
+        artifactName: 'NuGetPackage'
+        artifactType: pipeline
+
+    - task: PowerShell@2
+      displayName: Create NuGet config for SmokeTest
+      inputs:
+        targetType: inline
+        script: |
+          $nugetConfig = @(
+            '<?xml version="1.0" encoding="utf-8"?>'
+            '<configuration>'
+            '  <packageSources>'
+            '    <clear />'
+            '    <add key="local-sdk" value="$(Build.ArtifactStagingDirectory)" />'
+            '    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />'
+            '  </packageSources>'
+            '</configuration>'
           )
-        continueOnError: true
-        displayName: Push NuGet package to NuGet
-        inputs:
-          command: push
-          nuGetFeedType: external
-          allowPackageConflicts: true
-          packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
-          publishFeedCredentials: 'NuGet-$(System.TeamProject)'
+          $nugetConfig | Set-Content -Path "$(Build.SourcesDirectory)/test/SmokeTest/NuGet.Azdo.Config"
+
+    - task: DotNetCoreCLI@2
+      displayName: Restore SmokeTest
+      inputs:
+        command: 'restore'
+        projects: 'test/SmokeTest/SmokeTest.csproj'
+        feedsToUse: 'config'
+        nugetConfigPath: '$(Build.SourcesDirectory)/test/SmokeTest/NuGet.Azdo.Config'
 
+    - task: DotNetCoreCLI@2
+      displayName: Build SmokeTest
+      inputs:
+        command: 'build'
+        projects: 'test/SmokeTest/SmokeTest.csproj'
+        arguments: '--configuration $(buildConfiguration) --no-restore'
+    
+    - task: NuGetCommand@2
+      condition: >-
+        and(
+          succeeded(),
+          eq(variables['System.PullRequest.PullRequestId'], ''),
+          not(startsWith(variables['Build.SourceBranch'], 'refs/pull/')),
+          eq(variables['StartReleaseCandidate'], false),
+          not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+        )
+      continueOnError: true
+      displayName: Push NuGet package to NuGet
+      inputs:
+        command: push
+        nuGetFeedType: external
+        allowPackageConflicts: true
+        packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+        publishFeedCredentials: 'NuGet-$(System.TeamProject)'
 
 # report build failure to Discord
 - stage: Report_Build_Failure
-  dependsOn:
-    - Build
+  dependsOn: Build
   condition: failed('Build')
 
   jobs:
diff --git a/src/nanoFramework.NET.Sdk/Sdk/Rules/NanoDebugger.xaml b/src/nanoFramework.NET.Sdk/Sdk/Rules/NanoDebugger.xaml
new file mode 100644
index 0000000..9482dc1
--- /dev/null
+++ b/src/nanoFramework.NET.Sdk/Sdk/Rules/NanoDebugger.xaml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright, Microsoft Corporation, All rights reserved.-->
+<Rule
+	Name="NanoDebugger"
+	DisplayName=".NET nanoFramework Device"
+	PageTemplate="debugger"
+	Description="NanoDebugger Debugger options"
+	xmlns="http://schemas.microsoft.com/build/2009/properties">
+    <Rule.DataSource>
+        <DataSource Persistence="UserFileWithXamlDefaults" />
+    </Rule.DataSource>
+
+    <StringProperty Name="NanoDebuggerCommand" DisplayName="Command"
+                Default="$(TargetPath)"
+                Description="The debug command to execute.">
+        <StringProperty.ValueEditors>
+            <ValueEditor EditorType="DefaultFindFullPathPropertyEditor" DisplayName="&lt;regsvr32.exe&gt;">
+                <ValueEditor.Metadata>
+                    <NameValuePair Name="Exename" Value="regsvr32.exe" />
+                </ValueEditor.Metadata>
+            </ValueEditor>
+            <ValueEditor EditorType="DefaultStringPropertyEditor" DisplayName="&lt;Edit...&gt;"/>
+            <ValueEditor EditorType="DefaultFilePropertyEditor" DisplayName="&lt;Browse...&gt;">
+                <ValueEditor.Metadata>
+                    <NameValuePair Name="Filters" Value="Executables (*.exe)|*.exe" />
+                </ValueEditor.Metadata>
+            </ValueEditor>
+        </StringProperty.ValueEditors>
+    </StringProperty>
+
+    <StringProperty Name="NanoDebuggerCommandArguments" DisplayName="Command Arguments"
+                Description="The command line arguments to pass to the application.">
+        <Argument Property="NanoDebuggerCommand" />
+    </StringProperty>
+    <StringProperty Name="NanoDebuggerWorkingDirectory" DisplayName="Working Directory"
+                Default="$(MSBuildProjectDirectory)"
+                Description="The application's working directory. By default, the directory containing the project file."
+                Subtype="folder"/>
+    <BoolProperty Name="NanoDebuggerDebuggerAttach" DisplayName="Attach"
+                Default="False"
+                Description="Specifies whether the debugger should attempt to attach to an existing process when debugging starts." />
+</Rule>
diff --git a/src/nanoFramework.NET.Sdk/Sdk/Sdk.props b/src/nanoFramework.NET.Sdk/Sdk/Sdk.props
index 5df4567..6fb2ede 100644
--- a/src/nanoFramework.NET.Sdk/Sdk/Sdk.props
+++ b/src/nanoFramework.NET.Sdk/Sdk/Sdk.props
@@ -1,31 +1,35 @@
 <Project>
   <!--
-    nanoFramework SDK - Sdk.props
+    nanoFramework SDK - Sdk.props  (thin orchestrator)
     Auto-imported at the top of SDK-style nanoFramework projects.
 
     Strategy: Use Microsoft.NET.Sdk as the base SDK for standard MSBuild
     infrastructure (NuGet restore, PackageReference, implicit globs, pack).
     Override the TFM, compiler flags, and add nanoFramework-specific properties.
+
+    This file is a thin orchestrator: it owns the Microsoft.NET.Sdk props import
+    chain (so the legacy NFProjectSystem.CSharp.targets double-import cannot occur)
+    and <Import>s the focused module that carries the TFM identity. The matching
+    targets-time modules (MDP pipeline, CPS capabilities) are imported from
+    Sdk.targets, where project-body values like NanoIsCoreLibrary / TargetName have
+    been set.
   -->
 
   <!-- ============================================================ -->
   <!--  Pre-SDK properties  (set BEFORE Microsoft.NET.Sdk import)    -->
   <!-- ============================================================ -->
   <PropertyGroup>
-    <TargetFramework Condition="'$(TargetFramework)' == ''">netnano1.0</TargetFramework>
-
-    <!-- Disable .NET framework reference resolution — nanoFramework has its own mscorlib -->
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-
     <!--
-      Existing nanoFramework NuGet packages place files in a flat lib\ directory
-      (no TFM subfolder). NuGet interprets those as ".NETFramework,Version=v0.0".
-      AssetTargetFallback tells NuGet: if no netnano1.0 assets exist, accept "net" assets.
+      VS source-level debugging of nanoFramework projects resolves source<->IL from a
+      *Windows/full* PDB. Emit one for Debug. This MUST be set before the Microsoft.NET.Sdk
+      import below (that SDK defaults DebugType=portable when empty, so its default must be
+      pre-empted). Built in VS (.NET-Framework csc) `full` yields a Windows PDB and source
+      breakpoints bind; a portable PDB makes VS bind at the method entry only (one startup
+      hit, never on the line). Under `dotnet build` (.NET-Core csc) `full` still emits
+      portable, but the CLI doesn't debug — so Debug=full is the correct default. VS passes
+      Configuration as a global property, so it's set here; Release/CLI fall through to portable.
     -->
-    <AssetTargetFallback Condition="'$(AssetTargetFallback)' == ''">net</AssetTargetFallback>
-
-    <!-- Suppress NU1701 warning for the expected fallback -->
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <DebugType Condition="'$(DebugType)' == '' and '$(Configuration)' == 'Debug'">full</DebugType>
   </PropertyGroup>
 
   <!-- ============================================================ -->
@@ -34,7 +38,9 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <!-- ============================================================ -->
-  <!--  SDK root paths (used to locate bundled task DLLs)            -->
+  <!--  SDK root paths (used to locate bundled task DLLs and to       -->
+  <!--  redirect framework-directory resolution — consumed by the     -->
+  <!--  TFM module below and the MDP module in Sdk.targets)           -->
   <!-- ============================================================ -->
   <PropertyGroup>
     <_NfSdkDir>$(MSBuildThisFileDirectory)</_NfSdkDir>
@@ -42,42 +48,10 @@
   </PropertyGroup>
 
   <!-- ============================================================ -->
-  <!--  nanoFramework Target Framework Identity                      -->
-  <!--  (override whatever Microsoft.NET.Sdk inferred)               -->
-  <!-- ============================================================ -->
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETnanoFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <TargetFrameworkMoniker>.NETnanoFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
-    <TargetFrameworkMonikerDisplayName>.NET nanoFramework 1.0</TargetFrameworkMonikerDisplayName>
-    <NuGetTargetMoniker>.NETnanoFramework,Version=$(TargetFrameworkVersion)</NuGetTargetMoniker>
-  </PropertyGroup>
-
-  <!-- ============================================================ -->
-  <!--  C# Compiler settings for nanoFramework                       -->
+  <!--  nanoFramework target-framework identity                      -->
+  <!--  (TFM moniker + compiler/TFM-shaping props)                   -->
   <!-- ============================================================ -->
-  <PropertyGroup>
-    <LangVersion Condition="'$(LangVersion)' == ''">13.0</LangVersion>
-
-    <!-- Prevent standard .NET library references — nanoFramework provides its own mscorlib -->
-    <NoStdLib>true</NoStdLib>
-    <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-
-    <!-- Disable .NET Framework-specific features -->
-    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
-
-    <!-- Required for Roslyn to compile without a standard class library -->
-    <TargetingClr2Framework>true</TargetingClr2Framework>
-
-    <!--
-      Point framework directories to the SDK folder (which has no .NET assemblies).
-      Prevents the compiler from accidentally resolving standard .NET types.
-    -->
-    <_TargetFrameworkDirectories>$(_NfSdkDir)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(_NfSdkDir)</_FullFrameworkReferenceAssemblyPaths>
-  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)nanoFramework.Tfm.props" />
 
   <!-- ============================================================ -->
   <!--  Visual Studio / IDE settings                                 -->
@@ -90,47 +64,13 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
 
-  <!-- Roslyn core assembly support (.rsp file) — actual setting moved to Sdk.targets -->
-
-  <!--
-    NOTE: Core assembly (mscorlib) suppressions for GenerateAssembly*Attribute
-    are in Sdk.targets because IsCoreAssembly is set in the project file,
-    which is evaluated AFTER Sdk.props but BEFORE Sdk.targets.
-  -->
-
-  <!-- ============================================================ -->
-  <!--  Metadata Processor defaults                                  -->
-  <!--  NOTE: NanoIsCoreLibrary-dependent defaults are in Sdk.targets -->
-  <!--  because the property is set in the project file.             -->
-  <!-- ============================================================ -->
-  <PropertyGroup>
-    <NFMDP_PE_Verbose Condition="'$(NFMDP_PE_Verbose)' == ''">false</NFMDP_PE_Verbose>
-    <NFMDP_PE_VerboseMinimize Condition="'$(NFMDP_PE_VerboseMinimize)' == ''">false</NFMDP_PE_VerboseMinimize>
-  </PropertyGroup>
-
-  <!-- Stub/skeleton path defaults (project-independent) -->
-  <PropertyGroup>
-    <NanoGenerateStubsDirectory Condition="'$(NanoGenerateStubsDirectory)' == ''">$(ProjectDir)Stubs</NanoGenerateStubsDirectory>
-  </PropertyGroup>
   <!--
-    NOTE: NanoGenerateStubsRootName, NanoGenerateSkeletonProjectName, and
-    NanoGenerateSkeletonFile depend on $(TargetName) which is set after Sdk.props.
-    These defaults are in Sdk.targets.
+    NOTE: Core assembly (mscorlib) suppressions for GenerateAssembly*Attribute,
+    the NanoIsCoreLibrary-dependent MDP defaults, TargetName-derived stub paths,
+    and the MDP PackageReference all depend on values set in the project file
+    (evaluated AFTER Sdk.props). They live in the targets-time modules
+    (nanoFramework.Mdp.targets / nanoFramework.Capabilities.targets) imported from
+    Sdk.targets — NOT here.
   -->
 
-  <!-- ============================================================ -->
-  <!--  Auto-inject MetadataProcessor package reference              -->
-  <!-- ============================================================ -->
-  <PropertyGroup>
-    <NanoFrameworkMDPVersion Condition="'$(NanoFrameworkMDPVersion)' == ''">3.0.29</NanoFrameworkMDPVersion>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(NF_MDP_MSBUILDTASK_PATH)' == '' and '$(DisableNanoFrameworkMDP)' != 'true'">
-    <PackageReference Include="nanoFramework.Tools.MetadataProcessor.MsBuildTask"
-                      Version="$(NanoFrameworkMDPVersion)"
-                      PrivateAssets="all"
-                      GeneratePathProperty="true"
-                      ExcludeAssets="runtime;compile;build;buildTransitive"
-                      IsImplicitlyDefined="true" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/nanoFramework.NET.Sdk/Sdk/Sdk.targets b/src/nanoFramework.NET.Sdk/Sdk/Sdk.targets
index 27a0451..6ba18ce 100644
--- a/src/nanoFramework.NET.Sdk/Sdk/Sdk.targets
+++ b/src/nanoFramework.NET.Sdk/Sdk/Sdk.targets
@@ -1,17 +1,27 @@
 <Project>
   <!--
-    nanoFramework SDK - Sdk.targets
+    nanoFramework SDK - Sdk.targets  (thin orchestrator)
     Auto-imported at the bottom of SDK-style nanoFramework projects.
 
     Strategy: Import Microsoft.NET.Sdk targets (C# compilation, NuGet resolution, pack),
     then add nanoFramework build pipeline (MetadataProcessor, resource gen, binary output).
+
+    This file is a thin orchestrator. It owns the Microsoft.NET.Sdk targets import chain
+    and <Import>s the focused targets-time modules:
+      - nanoFramework.Mdp.targets         — the Metadata Processor build pipeline,
+      - nanoFramework.Capabilities.targets — the CPS capabilities + debugger property page.
+    Both are imported AFTER the Microsoft.NET.Sdk import so that project-body values
+    (NanoIsCoreLibrary) and the standard build properties ($(TargetName) etc.) are set.
   -->
 
   <!-- ============================================================ -->
-  <!--  Append NETNANO1_0 define constant                     -->
+  <!--  Compilation define constants                                 -->
+  <!--  NETNANO1_0 is the SDK-style symbol; NANOFRAMEWORK_1_0 is the  -->
+  <!--  legacy NFProjectSystem symbol, kept for source compatibility  -->
+  <!--  so existing `#if NANOFRAMEWORK_1_0` code still compiles.       -->
   <!-- ============================================================ -->
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NETNANO1_0</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETNANO1_0;NANOFRAMEWORK_1_0</DefineConstants>
   </PropertyGroup>
 
   <!-- ============================================================ -->
@@ -36,29 +46,6 @@
     <CompilerResponseFile>$(ProjectDir)coreAssembly.rsp</CompilerResponseFile>
   </PropertyGroup>
 
-  <!-- ============================================================ -->
-  <!--  Metadata Processor defaults (depend on NanoIsCoreLibrary)    -->
-  <!--  Must be in Sdk.targets because NanoIsCoreLibrary is set in  -->
-  <!--  the project file.                                            -->
-  <!-- ============================================================ -->
-  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' == 'True'">
-    <NFMDP_GENERATE_PE Condition="'$(NFMDP_GENERATE_PE)' == ''">true</NFMDP_GENERATE_PE>
-    <NFMDP_DUMP_METADATA Condition="'$(NFMDP_DUMP_METADATA)' == ''">true</NFMDP_DUMP_METADATA>
-    <NFMDP_GENERATE_STUBS Condition="'$(NFMDP_GENERATE_STUBS)' == ''">true</NFMDP_GENERATE_STUBS>
-    <NFMDP_DAT_FILES Condition="'$(NFMDP_DAT_FILES)' == ''">true</NFMDP_DAT_FILES>
-    <NFMDP_XML_FILES Condition="'$(NFMDP_XML_FILES)' == ''">true</NFMDP_XML_FILES>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' != 'True'">
-    <NFMDP_GENERATE_PE Condition="'$(NFMDP_GENERATE_PE)' == ''">false</NFMDP_GENERATE_PE>
-    <NFMDP_DUMP_METADATA Condition="'$(NFMDP_DUMP_METADATA)' == ''">false</NFMDP_DUMP_METADATA>
-    <NFMDP_GENERATE_STUBS Condition="'$(NFMDP_GENERATE_STUBS)' == ''">false</NFMDP_GENERATE_STUBS>
-    <NFMDP_DAT_FILES Condition="'$(NFMDP_DAT_FILES)' == ''">false</NFMDP_DAT_FILES>
-    <NFMDP_XML_FILES Condition="'$(NFMDP_XML_FILES)' == ''">false</NFMDP_XML_FILES>
-  </PropertyGroup>
-
-  <!-- Stub/skeleton path defaults — moved to after Microsoft.NET.Sdk import
-       where $(TargetName) is available -->
-
   <!-- ============================================================ -->
   <!--  Import Microsoft.NET.Sdk targets                             -->
   <!--  Provides: C# compilation, NuGet package resolution, pack     -->
@@ -78,18 +65,19 @@
   </PropertyGroup>
 
   <!-- ============================================================ -->
-  <!--  Project capabilities                                         -->
+  <!--  Metadata Processor build pipeline                            -->
+  <!--  (MDP PackageReference, task resolution, MDP/copy/clean/      -->
+  <!--   resource/binary targets — depend on TargetName /            -->
+  <!--   NanoIsCoreLibrary set in the project body)                  -->
   <!-- ============================================================ -->
-  <ItemGroup>
-    <ProjectCapability Include="NanoCSharpProject" />
-  </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)nanoFramework.Mdp.targets" />
 
-  <!-- Stub/skeleton path defaults (after SDK import so TargetName is available) -->
-  <PropertyGroup>
-    <NanoGenerateStubsRootName Condition="'$(NanoGenerateStubsRootName)' == ''">$(TargetName)</NanoGenerateStubsRootName>
-    <NanoGenerateSkeletonProjectName Condition="'$(NanoGenerateSkeletonProjectName)' == ''">$(TargetName)</NanoGenerateSkeletonProjectName>
-    <NanoGenerateSkeletonFile>$(NanoGenerateStubsDirectory)\$(NanoGenerateStubsRootName)</NanoGenerateSkeletonFile>
-  </PropertyGroup>
+  <!-- ============================================================ -->
+  <!--  CPS capabilities + debugger property page                    -->
+  <!--  (imported after the SDK import so the capability Remove       -->
+  <!--   follows the C# project system's Include)                    -->
+  <!-- ============================================================ -->
+  <Import Project="$(MSBuildThisFileDirectory)nanoFramework.Capabilities.targets" />
 
   <!-- ============================================================ -->
   <!--  GenerateTargetFrameworkMonikerAttribute override              -->
@@ -129,336 +117,4 @@
     <CommandLineArgsForDesignTimeEvaluation Condition="'$(DefineConstants)' != ''">$(CommandLineArgsForDesignTimeEvaluation) -define:$(DefineConstants)</CommandLineArgsForDesignTimeEvaluation>
   </PropertyGroup>
 
-  <!-- ============================================================ -->
-  <!--  Build task declarations                                      -->
-  <!-- ============================================================ -->
-  <PropertyGroup>
-    <_NfSdkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_NfSdkRoot)tasks\net8.0\</_NfSdkTasksDir>
-    <_NfSdkTasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_NfSdkRoot)tasks\net472\</_NfSdkTasksDir>
-  </PropertyGroup>
-
-  <!-- nanoFramework Build Tasks (bundled in SDK) -->
-  <UsingTask TaskName="nanoFramework.Tools.GenerateBinaryOutputTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
-             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
-  <UsingTask TaskName="nanoFramework.Tools.GenerateBinaryOutputTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
-             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
-
-  <UsingTask TaskName="nanoFramework.Tools.GenerateNanoResourceTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
-             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
-  <UsingTask TaskName="nanoFramework.Tools.GenerateNanoResourceTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
-             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
-
-  <UsingTask TaskName="nanoFramework.Tools.ResolveRuntimeDependenciesTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
-             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
-  <UsingTask TaskName="nanoFramework.Tools.ResolveRuntimeDependenciesTask"
-             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
-             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
-
-  <!-- MetadataProcessor — resolve the task DLL from NuGet package or env var override -->
-  <PropertyGroup>
-    <!-- Determine MDP task TFM based on MSBuild runtime -->
-    <_NfMdpTasksTFM Condition="'$(MSBuildRuntimeType)' == 'Core'">net6.0</_NfMdpTasksTFM>
-    <_NfMdpTasksTFM Condition="'$(_NfMdpTasksTFM)' == ''">net472</_NfMdpTasksTFM>
-    <!-- Resolve MDP task directory from NuGet package using GeneratePathProperty -->
-    <_NfMdpTasksDir Condition="'$(NF_MDP_MSBUILDTASK_PATH)' == '' and '$(DisableNanoFrameworkMDP)' != 'true' and '$(PkgnanoFramework_Tools_MetadataProcessor_MsBuildTask)' != ''">$(PkgnanoFramework_Tools_MetadataProcessor_MsBuildTask)\lib\$(_NfMdpTasksTFM)\</_NfMdpTasksDir>
-    <_NfMdpTasksDir Condition="'$(NF_MDP_MSBUILDTASK_PATH)' != ''">$(NF_MDP_MSBUILDTASK_PATH)\</_NfMdpTasksDir>
-  </PropertyGroup>
-
-  <UsingTask TaskName="MetaDataProcessorTask"
-             Condition="'$(_NfMdpTasksDir)' != ''"
-             AssemblyFile="$(_NfMdpTasksDir)nanoFramework.Tools.MetadataProcessor.MsBuildTask.dll" />
-
-  <!-- ============================================================ -->
-  <!--  Common MDP build pipeline properties                         -->
-  <!-- ============================================================ -->
-  <PropertyGroup>
-    <NanoFramework_StartProgram Condition="'$(StartAction)' == 'Program'">$(StartProgram)</NanoFramework_StartProgram>
-    <NanoFramework_IntermediateAssembly>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)</NanoFramework_IntermediateAssembly>
-    <NanoFramework_Assembly>$(OutDir)$(TargetName)</NanoFramework_Assembly>
-  </PropertyGroup>
-
-  <!-- ============================================================ -->
-  <!--  Build pipeline overrides for REGULAR projects                -->
-  <!-- ============================================================ -->
-  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' != 'True'">
-    <MetaDataProcessorDependsOn>Compile;CopyToOutDir</MetaDataProcessorDependsOn>
-
-    <CoreBuildDependsOn>
-      BuildOnlySettings;
-      PrepareForBuild;
-      PreBuildEvent;
-      ResolveReferences;
-      PrepareResources;
-      ResolveKeySource;
-      Compile;
-      GenerateSerializationAssemblies;
-      CreateSatelliteAssemblies;
-      GetTargetPath;
-      PrepareForRun;
-      IncrementalClean;
-      MetaDataProcessor;
-      PostBuildEvent
-    </CoreBuildDependsOn>
-
-    <PrepareForRunDependsOn>
-      MetaDataProcessor;
-      CopyFilesToOutputDirectory;
-      CopyNanoFrameworkFiles;
-      CopyBackNanoFrameworkDlls
-    </PrepareForRunDependsOn>
-
-    <PrepareResourcesDependsOn>
-      PrepareResourceNames;
-      ResGen;
-      CompileLicxFiles;
-      NanoResourceGenerator
-    </PrepareResourcesDependsOn>
-
-    <ResolveReferencesDependsOn>
-      BeforeResolveReferences;
-      ResolveProjectReferences;
-      ResolveAssemblyReferences;
-      ResolveRuntimeDependencies;
-      AfterResolveReferences
-    </ResolveReferencesDependsOn>
-  </PropertyGroup>
-
-  <!-- ============================================================ -->
-  <!--  Build pipeline overrides for CORE ASSEMBLY projects          -->
-  <!-- ============================================================ -->
-  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' == 'True'">
-    <CoreBuildDependsOn>$(CoreBuildDependsOn);MetaDataProcessorCompile</CoreBuildDependsOn>
-    <PrepareResourcesDependsOn>$(PrepareResourcesDependsOn);NanoResourceGenerator</PrepareResourcesDependsOn>
-    <CleanDependsOn>$(CleanDependsOn);NanoCLR_CleanExtraFiles</CleanDependsOn>
-    <ResolveReferencesDependsOn>$(ResolveReferencesDependsOn);ResolveRuntimeDependencies</ResolveReferencesDependsOn>
-    <CoreBuildDependsOn>$(CoreBuildDependsOn);NFMDP_CreateDatabaseAndDependencyMap</CoreBuildDependsOn>
-    <NFMDP_GENERATE_STUBS>true</NFMDP_GENERATE_STUBS>
-
-    <NFMDP_PE_Parse>$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)</NFMDP_PE_Parse>
-    <NFMDP_PE_Compile>$(ProjectDir)$(IntermediateOutputPath)$(TargetName).pe</NFMDP_PE_Compile>
-    <NFMDP_PE_Compile_NoExt>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)</NFMDP_PE_Compile_NoExt>
-    <NFMDP_PE_SaveStrings>$(ProjectDir)$(IntermediateOutputPath)$(TargetName).strings</NFMDP_PE_SaveStrings>
-    <NFMDP_PE_DumpExports>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)_exports.txt</NFMDP_PE_DumpExports>
-    <NFMDP_PE_GenerateDependency>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)_dependency_map.xml</NFMDP_PE_GenerateDependency>
-    <NFMDP_STUB_GenerateSkeletonName>$(AssemblyName)</NFMDP_STUB_GenerateSkeletonName>
-    <NFMDP_STUB_Resolve>true</NFMDP_STUB_Resolve>
-  </PropertyGroup>
-
-  <!-- ============================================================ -->
-  <!--  Clean targets                                                -->
-  <!-- ============================================================ -->
-  <Target Name="NanoFrameworkClean">
-    <Delete Condition="EXISTS('$(OutDir)$(TargetName).pe')"   Files="$(OutDir)$(TargetName).pe" />
-    <Delete Condition="EXISTS('$(OutDir)$(TargetName).pdbx')" Files="$(OutDir)$(TargetName).pdbx" />
-  </Target>
-
-  <!-- ============================================================ -->
-  <!--  Copy targets                                                 -->
-  <!-- ============================================================ -->
-  <Target Name="CopyToOutDir">
-    <Copy Condition="Exists('$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)')"
-          SourceFiles="$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)"
-          DestinationFolder="$(OutDir)">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-  </Target>
-
-  <Target Name="CopyNanoFrameworkFiles">
-    <Copy Condition="Exists('$(NanoFramework_IntermediateAssembly).pe')"
-          SourceFiles="$(NanoFramework_IntermediateAssembly).pe"
-          DestinationFiles="$(NanoFramework_Assembly).pe" SkipUnchangedFiles="true">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-    <Copy Condition="Exists('$(NanoFramework_IntermediateAssembly).pdbx')"
-          SourceFiles="$(NanoFramework_IntermediateAssembly).pdbx"
-          DestinationFiles="$(NanoFramework_Assembly).pdbx" SkipUnchangedFiles="true">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-    <Copy SourceFiles="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pe')"
-          DestinationFiles="@(ReferenceCopyLocalPaths->'$(OutDir)%(Filename).pe')"
-          SkipUnchangedFiles="true" ContinueOnError="true">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-    <Copy SourceFiles="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdbx')"
-          DestinationFiles="@(ReferenceCopyLocalPaths->'$(OutDir)%(Filename).pdbx')"
-          SkipUnchangedFiles="true" ContinueOnError="true">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-  </Target>
-
-  <Target Name="CopyBackNanoFrameworkDlls">
-    <Copy SourceFiles="@(ReferenceCopyLocalPaths)"
-          DestinationFiles="@(ReferenceCopyLocalPaths->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
-          SkipUnchangedFiles="false">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-  </Target>
-
-  <!-- ============================================================ -->
-  <!--  MetaDataProcessor target (REGULAR projects)                  -->
-  <!-- ============================================================ -->
-  <Target Name="MetaDataProcessor"
-          Inputs="$(NanoFramework_Assembly)$(TargetExt);@(ReferencePath);@(ReferenceDependencyPaths);@(NanoFramework_Resources)"
-          Outputs="$(NanoFramework_IntermediateAssembly).pe"
-          DependsOnTargets="$(MetaDataProcessorDependsOn)"
-          Condition="'$(NanoIsCoreLibrary)' != 'True' and '$(DisableNanoFrameworkMDP)' != 'true'">
-
-    <PropertyGroup>
-      <NFMDP_STUB_GenerateSkeletonProject>$(NanoGenerateSkeletonProjectName)</NFMDP_STUB_GenerateSkeletonProject>
-      <NFMDP_STUB_GenerateSkeletonName>$(NanoGenerateStubsRootName)</NFMDP_STUB_GenerateSkeletonName>
-      <NFMDP_STUB_GenerateSkeletonFile>$(NanoGenerateSkeletonFile)</NFMDP_STUB_GenerateSkeletonFile>
-      <NFMDP_STUB_SkeletonWithoutInterop>false</NFMDP_STUB_SkeletonWithoutInterop>
-    </PropertyGroup>
-
-    <MetaDataProcessorTask
-        Verbose="$(NFMDP_PE_Verbose)"
-        Parse="$(NanoFramework_Assembly)$(TargetExt)"
-        IsCoreLibrary="$(NanoIsCoreLibrary)"
-        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
-        DumpMetadata="$(NFMDP_DUMP_METADATA)"
-        DumpExports="$(NFMDP_STUB_DumpExports)"
-        GenerateDependency="$(NFMDP_STUB_GenerateDependency)"
-        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
-        LoadHints="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
-        Compile="$(NanoFramework_IntermediateAssembly).pe"
-        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
-        GenerateSkeletonFile="$(NFMDP_STUB_GenerateSkeletonFile)"
-        GenerateSkeletonName="$(NFMDP_STUB_GenerateSkeletonName)"
-        GenerateSkeletonProject="$(NFMDP_STUB_GenerateSkeletonProject)"
-        SkeletonWithoutInterop="$(NFMDP_STUB_SkeletonWithoutInterop)"
-        ImportResources="@(NanoFramework_Resources)">
-      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
-      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
-    </MetaDataProcessorTask>
-
-    <CallTarget Targets="NanoGenerateBinaryOutput" />
-
-    <!-- Output native checksum to CI pipelines -->
-    <Message Text="##vso[task.setvariable variable=NF_NATIVE_ASSEMBLY_CHECKSUM;]$(NativeChecksum)"
-             Condition="'$(TF_BUILD)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
-    <WriteLinesToFile File="$(GITHUB_ENV)" Lines="NF_NATIVE_ASSEMBLY_CHECKSUM=$(NativeChecksum)"
-                      Condition="'$(GITHUB_ACTIONS)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
-  </Target>
-
-  <!-- ============================================================ -->
-  <!--  MetaDataProcessorCompile target (CORE ASSEMBLY)              -->
-  <!-- ============================================================ -->
-  <Target Name="MetaDataProcessorCompile"
-          DependsOnTargets="ResolveRuntimeDependencies"
-          Condition="'$(NFMDP_GENERATE_PE)' == 'true' and '$(NanoIsCoreLibrary)' == 'True'">
-
-    <PropertyGroup>
-      <NFMDP_STUB_GenerateSkeletonProject Condition="'$(NFMDP_STUB_GenerateSkeletonProject)' == ''">$(NanoGenerateSkeletonProjectName)</NFMDP_STUB_GenerateSkeletonProject>
-      <NFMDP_STUB_GenerateSkeletonName Condition="'$(NFMDP_STUB_GenerateSkeletonName)' == ''">$(NanoGenerateStubsRootName)</NFMDP_STUB_GenerateSkeletonName>
-      <NFMDP_STUB_GenerateSkeletonFile Condition="'$(NFMDP_STUB_GenerateSkeletonFile)' == ''">$(NanoGenerateSkeletonFile)</NFMDP_STUB_GenerateSkeletonFile>
-      <NFMDP_STUB_SkeletonWithoutInterop>true</NFMDP_STUB_SkeletonWithoutInterop>
-    </PropertyGroup>
-
-    <!-- Compile to PE (no stubs) -->
-    <MetaDataProcessorTask
-        Verbose="$(NFMDP_PE_Verbose)"
-        Parse="$(NFMDP_PE_Parse)"
-        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
-        Compile="$(NFMDP_PE_Compile)"
-        DumpMetadata="$(NFMDP_DUMP_METADATA)"
-        DumpExports="$(NFMDP_PE_DumpExports)"
-        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
-        GenerateDependency="$(NFMDP_PE_GenerateDependency)"
-        LoadHints="@(NFMDP_PE_LoadHints)"
-        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
-        Condition="'$(NFMDP_GENERATE_STUBS)' == 'false'">
-      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
-      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
-    </MetaDataProcessorTask>
-
-    <!-- Create STUB file -->
-    <MetaDataProcessorTask
-        Verbose="$(NFMDP_PE_Verbose)"
-        Parse="$(NFMDP_PE_Parse)"
-        IsCoreLibrary="$(NanoIsCoreLibrary)"
-        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
-        Compile="$(NFMDP_PE_Compile)"
-        DumpMetadata="$(NFMDP_DUMP_METADATA)"
-        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
-        GenerateSkeletonFile="$(NFMDP_STUB_GenerateSkeletonFile)"
-        GenerateSkeletonName="$(NFMDP_STUB_GenerateSkeletonName)"
-        GenerateSkeletonProject="$(NFMDP_STUB_GenerateSkeletonProject)"
-        SkeletonWithoutInterop="$(NFMDP_STUB_SkeletonWithoutInterop)"
-        LoadHints="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
-        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
-        Condition="'$(NFMDP_GENERATE_STUBS)' == 'true'">
-      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
-      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
-    </MetaDataProcessorTask>
-
-    <!-- Output native checksum to CI pipelines -->
-    <Message Text="##vso[task.setvariable variable=NF_NATIVE_ASSEMBLY_CHECKSUM;]$(NativeChecksum)"
-             Condition="'$(TF_BUILD)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
-    <WriteLinesToFile File="$(GITHUB_ENV)" Lines="NF_NATIVE_ASSEMBLY_CHECKSUM=$(NativeChecksum)"
-                      Condition="'$(GITHUB_ACTIONS)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
-
-    <CallTarget Targets="CopyFilesToOutputDirectory" />
-    <CallTarget Targets="CopyNanoFrameworkFiles" />
-    <CallTarget Targets="CopyBackNanoFrameworkDlls" />
-  </Target>
-
-  <Target Name="NFMDP_CreateDatabaseAndDependencyMap" DependsOnTargets="MetaDataProcessorDat" />
-
-  <!-- Placeholder DAT target (full implementation for core builds) -->
-  <Target Name="MetaDataProcessorDat" Condition="'$(NFMDP_DAT_FILES)' == 'true'" />
-
-  <!-- ============================================================ -->
-  <!--  ResolveRuntimeDependencies                                   -->
-  <!-- ============================================================ -->
-  <Target Name="ResolveRuntimeDependencies">
-    <ResolveRuntimeDependenciesTask
-        Condition="'$(BuildingInsideVisualStudio)' == 'true'"
-        Assembly="$(NanoFramework_Assembly)$(TargetExt)"
-        AssemblyReferences="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
-        StartProgram="$(NanoFramework_StartProgram)"
-        StartProgramReferences="@(NanoFramework_StartProgram_ResolvedFiles);@(NanoFramework_StartProgram_ResolvedDependencyFiles)" />
-  </Target>
-
-  <!-- ============================================================ -->
-  <!--  Resource and binary output targets                           -->
-  <!-- ============================================================ -->
-  <Target Name="NanoResourceGenerator"
-          Condition="'@(EmbeddedResource)' != ''">
-    <GenerateNanoResourceTask
-        Sources="@(EmbeddedResource)"
-        Condition="'%(EmbeddedResource.Type)' == 'Resx' and '%(EmbeddedResource.GenerateResource)' != 'false'"
-        References="@(ReferencePath)"
-        UseSourcePath="$(UseSourcePath)"
-        StateFile="$(IntermediateOutputPath)$(MSBuildProjectFile).NanoResourceGenerator.Cache"
-        OutputResources="@(EmbeddedResource->'$(ProjectDir)$(IntermediateOutputPath)%(ManifestResourceName).nanoresources')">
-      <Output TaskParameter="OutputResources" ItemName="NanoFramework_Resources" />
-      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
-    </GenerateNanoResourceTask>
-  </Target>
-
-  <Target Name="NanoGenerateBinaryOutput"
-          DependsOnTargets="ResolveReferences">
-    <GenerateBinaryOutputTask
-        AssemblyPE="$(NanoFramework_IntermediateAssembly).pe"
-        Assembly="$(NanoFramework_Assembly)$(TargetExt)"
-        AssemblyReferences="@(ReferencePath);@(ReferenceDependencyPaths)">
-      <Output TaskParameter="FileWritten" ItemName="FileWrites" />
-    </GenerateBinaryOutputTask>
-  </Target>
-
-  <!-- Clean extra files for core assembly builds -->
-  <Target Name="NanoCLR_CleanExtraFiles" Condition="'$(NanoIsCoreLibrary)' == 'True'">
-    <Delete Files="$(NFMDP_PE_Compile);$(NFMDP_PE_Compile_NoExt).pdbx;$(NFMDP_PE_DumpExports);$(NFMDP_PE_GenerateDependency)"
-            TreatErrorsAsWarnings="true" />
-  </Target>
-
-  <!-- Suppress manifest/config copy -->
-  <Target Name="_CopyManifestFiles" />
-  <Target Name="_CopyApplicationConfigFiles" />
-
 </Project>
diff --git a/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Capabilities.targets b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Capabilities.targets
new file mode 100644
index 0000000..e8a9851
--- /dev/null
+++ b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Capabilities.targets
@@ -0,0 +1,39 @@
+<Project>
+  <!--
+    nanoFramework.Capabilities.targets — CPS capability injection + debugger wiring.
+
+    Imported from Sdk.targets AFTER the Microsoft.NET.Sdk targets import so the
+    capability Remove follows the C# project system's Include in item document order
+    (otherwise the later Include re-adds the LaunchProfiles capability).
+
+    Holds:
+      - the NanoCSharpProject capability (lights up the nanoFramework CPS providers),
+      - the LaunchProfiles capability removal (so F5 routes to the NanoDebugger flavor
+        instead of launching a local .NET console app),
+      - the PropertyPageSchema wiring for the NanoDebugger property page.
+
+    Import paths use $(MSBuildThisFileDirectory) so they resolve inside the packed SDK.
+  -->
+
+  <!-- ============================================================ -->
+  <!--  Project capabilities                                         -->
+  <!-- ============================================================ -->
+  <ItemGroup>
+    <!-- Remove the C# project system's LaunchProfiles capability: otherwise its
+         ProjectDebuggerProvider owns F5 and launches a local .NET console app instead of
+         deploying/debugging on the device. The NanoDebugger flavor (DebuggerFlavor in
+         Sdk.props) + the NanoDebugger rule route F5 to the nanoFramework debug engine. -->
+    <ProjectCapability Remove="LaunchProfiles" />
+    <ProjectCapability Include="NanoCSharpProject" />
+  </ItemGroup>
+
+  <!-- ============================================================ -->
+  <!--  Debugger property page (NanoDebugger flavor)                  -->
+  <!-- ============================================================ -->
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\NanoDebugger.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
+  </ItemGroup>
+
+</Project>
diff --git a/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Mdp.targets b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Mdp.targets
new file mode 100644
index 0000000..0d20ba8
--- /dev/null
+++ b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Mdp.targets
@@ -0,0 +1,410 @@
+<Project>
+  <!--
+    nanoFramework.Mdp.targets — the Metadata Processor (MDP) build pipeline.
+
+    Imported from Sdk.targets AFTER the Microsoft.NET.Sdk targets import, so that
+    $(TargetName), $(TargetDir), $(IntermediateOutputPath) and the standard build
+    targets (Compile, ResolveReferences, ...) are available for the MDP properties
+    and targets below.
+
+    Holds:
+      - the auto-injected MDP PackageReference + NanoFrameworkMDPVersion default,
+      - the MDP property defaults (verbosity, NanoIsCoreLibrary-driven switches),
+      - the _NfMdpTasksTFM / task-DLL resolution and UsingTask declarations,
+      - the build pipeline overrides + all MDP / copy / clean / resource / binary
+        output targets that produce the .pe / .pdbx / resources.
+
+    Import paths use $(MSBuildThisFileDirectory) so they resolve inside the packed SDK.
+  -->
+
+  <!-- ============================================================ -->
+  <!--  Metadata Processor defaults (project-independent)            -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <NFMDP_PE_Verbose Condition="'$(NFMDP_PE_Verbose)' == ''">false</NFMDP_PE_Verbose>
+    <NFMDP_PE_VerboseMinimize Condition="'$(NFMDP_PE_VerboseMinimize)' == ''">false</NFMDP_PE_VerboseMinimize>
+  </PropertyGroup>
+
+  <!-- Stub/skeleton path default (project-independent) -->
+  <PropertyGroup>
+    <NanoGenerateStubsDirectory Condition="'$(NanoGenerateStubsDirectory)' == ''">$(ProjectDir)Stubs</NanoGenerateStubsDirectory>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Auto-inject MetadataProcessor package reference              -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <NanoFrameworkMDPVersion Condition="'$(NanoFrameworkMDPVersion)' == ''">4.0.0-preview.98</NanoFrameworkMDPVersion>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(NF_MDP_MSBUILDTASK_PATH)' == '' and '$(DisableNanoFrameworkMDP)' != 'true'">
+    <PackageReference Include="nanoFramework.Tools.MetadataProcessor.MsBuildTask"
+                      Version="$(NanoFrameworkMDPVersion)"
+                      PrivateAssets="all"
+                      GeneratePathProperty="true"
+                      ExcludeAssets="runtime;compile;build;buildTransitive"
+                      IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+  <!-- ============================================================ -->
+  <!--  Metadata Processor defaults (depend on NanoIsCoreLibrary)    -->
+  <!--  NanoIsCoreLibrary is set in the project file, so these are   -->
+  <!--  in a targets-time module (after Sdk.props).                  -->
+  <!-- ============================================================ -->
+  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' == 'True'">
+    <NFMDP_GENERATE_PE Condition="'$(NFMDP_GENERATE_PE)' == ''">true</NFMDP_GENERATE_PE>
+    <NFMDP_DUMP_METADATA Condition="'$(NFMDP_DUMP_METADATA)' == ''">true</NFMDP_DUMP_METADATA>
+    <NFMDP_GENERATE_STUBS Condition="'$(NFMDP_GENERATE_STUBS)' == ''">true</NFMDP_GENERATE_STUBS>
+    <NFMDP_DAT_FILES Condition="'$(NFMDP_DAT_FILES)' == ''">true</NFMDP_DAT_FILES>
+    <NFMDP_XML_FILES Condition="'$(NFMDP_XML_FILES)' == ''">true</NFMDP_XML_FILES>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' != 'True'">
+    <NFMDP_GENERATE_PE Condition="'$(NFMDP_GENERATE_PE)' == ''">false</NFMDP_GENERATE_PE>
+    <NFMDP_DUMP_METADATA Condition="'$(NFMDP_DUMP_METADATA)' == ''">false</NFMDP_DUMP_METADATA>
+    <NFMDP_GENERATE_STUBS Condition="'$(NFMDP_GENERATE_STUBS)' == ''">false</NFMDP_GENERATE_STUBS>
+    <NFMDP_DAT_FILES Condition="'$(NFMDP_DAT_FILES)' == ''">false</NFMDP_DAT_FILES>
+    <NFMDP_XML_FILES Condition="'$(NFMDP_XML_FILES)' == ''">false</NFMDP_XML_FILES>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Stub/skeleton path defaults                                  -->
+  <!--  (depend on $(TargetName), available after the SDK import)    -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <NanoGenerateStubsRootName Condition="'$(NanoGenerateStubsRootName)' == ''">$(TargetName)</NanoGenerateStubsRootName>
+    <NanoGenerateSkeletonProjectName Condition="'$(NanoGenerateSkeletonProjectName)' == ''">$(TargetName)</NanoGenerateSkeletonProjectName>
+    <NanoGenerateSkeletonFile>$(NanoGenerateStubsDirectory)\$(NanoGenerateStubsRootName)</NanoGenerateSkeletonFile>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Build task declarations                                      -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <_NfSdkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_NfSdkRoot)tasks\net8.0\</_NfSdkTasksDir>
+    <_NfSdkTasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_NfSdkRoot)tasks\net472\</_NfSdkTasksDir>
+  </PropertyGroup>
+
+  <!-- nanoFramework Build Tasks (bundled in SDK) -->
+  <UsingTask TaskName="nanoFramework.Tools.GenerateBinaryOutputTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
+             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
+  <UsingTask TaskName="nanoFramework.Tools.GenerateBinaryOutputTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
+             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
+
+  <UsingTask TaskName="nanoFramework.Tools.GenerateNanoResourceTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
+             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
+  <UsingTask TaskName="nanoFramework.Tools.GenerateNanoResourceTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
+             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
+
+  <UsingTask TaskName="nanoFramework.Tools.ResolveRuntimeDependenciesTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' == ''"
+             AssemblyFile="$(_NfSdkTasksDir)nanoFramework.Tools.BuildTasks.dll" />
+  <UsingTask TaskName="nanoFramework.Tools.ResolveRuntimeDependenciesTask"
+             Condition="'$(NF_MSBUILDTASK_PATH)' != ''"
+             AssemblyFile="$(NF_MSBUILDTASK_PATH)\nanoFramework.Tools.BuildTasks.dll" />
+
+  <!-- MetadataProcessor — resolve the task DLL from NuGet package or env var override -->
+  <PropertyGroup>
+    <!-- Determine MDP task TFM based on MSBuild runtime. MDP 4.x ships net8.0 (Core) + net472. -->
+    <_NfMdpTasksTFM Condition="'$(MSBuildRuntimeType)' == 'Core'">net8.0</_NfMdpTasksTFM>
+    <_NfMdpTasksTFM Condition="'$(_NfMdpTasksTFM)' == ''">net472</_NfMdpTasksTFM>
+    <!-- Resolve MDP task directory from NuGet package using GeneratePathProperty -->
+    <_NfMdpTasksDir Condition="'$(NF_MDP_MSBUILDTASK_PATH)' == '' and '$(DisableNanoFrameworkMDP)' != 'true' and '$(PkgnanoFramework_Tools_MetadataProcessor_MsBuildTask)' != ''">$(PkgnanoFramework_Tools_MetadataProcessor_MsBuildTask)\lib\$(_NfMdpTasksTFM)\</_NfMdpTasksDir>
+    <_NfMdpTasksDir Condition="'$(NF_MDP_MSBUILDTASK_PATH)' != ''">$(NF_MDP_MSBUILDTASK_PATH)\</_NfMdpTasksDir>
+  </PropertyGroup>
+
+  <UsingTask TaskName="MetaDataProcessorTask"
+             Condition="'$(_NfMdpTasksDir)' != ''"
+             AssemblyFile="$(_NfMdpTasksDir)nanoFramework.Tools.MetadataProcessor.MsBuildTask.dll" />
+
+  <!-- ============================================================ -->
+  <!--  Common MDP build pipeline properties                         -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <NanoFramework_StartProgram Condition="'$(StartAction)' == 'Program'">$(StartProgram)</NanoFramework_StartProgram>
+    <NanoFramework_IntermediateAssembly>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)</NanoFramework_IntermediateAssembly>
+    <NanoFramework_Assembly>$(OutDir)$(TargetName)</NanoFramework_Assembly>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Build pipeline overrides for REGULAR projects                -->
+  <!-- ============================================================ -->
+  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' != 'True'">
+    <MetaDataProcessorDependsOn>Compile;CopyToOutDir</MetaDataProcessorDependsOn>
+
+    <CoreBuildDependsOn>
+      BuildOnlySettings;
+      PrepareForBuild;
+      PreBuildEvent;
+      ResolveReferences;
+      PrepareResources;
+      ResolveKeySource;
+      Compile;
+      GenerateSerializationAssemblies;
+      CreateSatelliteAssemblies;
+      GetTargetPath;
+      PrepareForRun;
+      IncrementalClean;
+      MetaDataProcessor;
+      PostBuildEvent
+    </CoreBuildDependsOn>
+
+    <PrepareForRunDependsOn>
+      MetaDataProcessor;
+      CopyFilesToOutputDirectory;
+      CopyNanoFrameworkFiles;
+      CopyBackNanoFrameworkDlls
+    </PrepareForRunDependsOn>
+
+    <PrepareResourcesDependsOn>
+      PrepareResourceNames;
+      ResGen;
+      CompileLicxFiles;
+      NanoResourceGenerator
+    </PrepareResourcesDependsOn>
+
+    <ResolveReferencesDependsOn>
+      BeforeResolveReferences;
+      ResolveProjectReferences;
+      ResolveAssemblyReferences;
+      ResolveRuntimeDependencies;
+      AfterResolveReferences
+    </ResolveReferencesDependsOn>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Build pipeline overrides for CORE ASSEMBLY projects          -->
+  <!-- ============================================================ -->
+  <PropertyGroup Condition="'$(NanoIsCoreLibrary)' == 'True'">
+    <CoreBuildDependsOn>$(CoreBuildDependsOn);MetaDataProcessorCompile</CoreBuildDependsOn>
+    <PrepareResourcesDependsOn>$(PrepareResourcesDependsOn);NanoResourceGenerator</PrepareResourcesDependsOn>
+    <CleanDependsOn>$(CleanDependsOn);NanoCLR_CleanExtraFiles</CleanDependsOn>
+    <ResolveReferencesDependsOn>$(ResolveReferencesDependsOn);ResolveRuntimeDependencies</ResolveReferencesDependsOn>
+    <CoreBuildDependsOn>$(CoreBuildDependsOn);NFMDP_CreateDatabaseAndDependencyMap</CoreBuildDependsOn>
+    <NFMDP_GENERATE_STUBS>true</NFMDP_GENERATE_STUBS>
+
+    <NFMDP_PE_Parse>$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)</NFMDP_PE_Parse>
+    <NFMDP_PE_Compile>$(ProjectDir)$(IntermediateOutputPath)$(TargetName).pe</NFMDP_PE_Compile>
+    <NFMDP_PE_Compile_NoExt>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)</NFMDP_PE_Compile_NoExt>
+    <NFMDP_PE_SaveStrings>$(ProjectDir)$(IntermediateOutputPath)$(TargetName).strings</NFMDP_PE_SaveStrings>
+    <NFMDP_PE_DumpExports>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)_exports.txt</NFMDP_PE_DumpExports>
+    <NFMDP_PE_GenerateDependency>$(ProjectDir)$(IntermediateOutputPath)$(TargetName)_dependency_map.xml</NFMDP_PE_GenerateDependency>
+    <NFMDP_STUB_GenerateSkeletonName>$(AssemblyName)</NFMDP_STUB_GenerateSkeletonName>
+    <NFMDP_STUB_Resolve>true</NFMDP_STUB_Resolve>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  Clean targets                                                -->
+  <!-- ============================================================ -->
+  <Target Name="NanoFrameworkClean">
+    <Delete Condition="EXISTS('$(OutDir)$(TargetName).pe')"   Files="$(OutDir)$(TargetName).pe" />
+    <Delete Condition="EXISTS('$(OutDir)$(TargetName).pdbx')" Files="$(OutDir)$(TargetName).pdbx" />
+  </Target>
+
+  <!-- ============================================================ -->
+  <!--  Copy targets                                                 -->
+  <!-- ============================================================ -->
+  <Target Name="CopyToOutDir">
+    <Copy Condition="Exists('$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)')"
+          SourceFiles="$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)"
+          DestinationFolder="$(OutDir)">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+  </Target>
+
+  <Target Name="CopyNanoFrameworkFiles">
+    <Copy Condition="Exists('$(NanoFramework_IntermediateAssembly).pe')"
+          SourceFiles="$(NanoFramework_IntermediateAssembly).pe"
+          DestinationFiles="$(NanoFramework_Assembly).pe" SkipUnchangedFiles="true">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+    <Copy Condition="Exists('$(NanoFramework_IntermediateAssembly).pdbx')"
+          SourceFiles="$(NanoFramework_IntermediateAssembly).pdbx"
+          DestinationFiles="$(NanoFramework_Assembly).pdbx" SkipUnchangedFiles="true">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+    <Copy SourceFiles="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pe')"
+          DestinationFiles="@(ReferenceCopyLocalPaths->'$(OutDir)%(Filename).pe')"
+          SkipUnchangedFiles="true" ContinueOnError="true">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+    <Copy SourceFiles="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdbx')"
+          DestinationFiles="@(ReferenceCopyLocalPaths->'$(OutDir)%(Filename).pdbx')"
+          SkipUnchangedFiles="true" ContinueOnError="true">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+  </Target>
+
+  <Target Name="CopyBackNanoFrameworkDlls">
+    <Copy SourceFiles="@(ReferenceCopyLocalPaths)"
+          DestinationFiles="@(ReferenceCopyLocalPaths->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="false">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+  </Target>
+
+  <!-- ============================================================ -->
+  <!--  MetaDataProcessor target (REGULAR projects)                  -->
+  <!-- ============================================================ -->
+  <Target Name="MetaDataProcessor"
+          Inputs="$(NanoFramework_Assembly)$(TargetExt);@(ReferencePath);@(ReferenceDependencyPaths);@(NanoFramework_Resources)"
+          Outputs="$(NanoFramework_IntermediateAssembly).pe"
+          DependsOnTargets="$(MetaDataProcessorDependsOn)"
+          Condition="'$(NanoIsCoreLibrary)' != 'True' and '$(DisableNanoFrameworkMDP)' != 'true'">
+
+    <PropertyGroup>
+      <NFMDP_STUB_GenerateSkeletonProject>$(NanoGenerateSkeletonProjectName)</NFMDP_STUB_GenerateSkeletonProject>
+      <NFMDP_STUB_GenerateSkeletonName>$(NanoGenerateStubsRootName)</NFMDP_STUB_GenerateSkeletonName>
+      <NFMDP_STUB_GenerateSkeletonFile>$(NanoGenerateSkeletonFile)</NFMDP_STUB_GenerateSkeletonFile>
+      <NFMDP_STUB_SkeletonWithoutInterop>false</NFMDP_STUB_SkeletonWithoutInterop>
+    </PropertyGroup>
+
+    <MetaDataProcessorTask
+        Verbose="$(NFMDP_PE_Verbose)"
+        Parse="$(NanoFramework_Assembly)$(TargetExt)"
+        IsCoreLibrary="$(NanoIsCoreLibrary)"
+        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
+        DumpMetadata="$(NFMDP_DUMP_METADATA)"
+        DumpExports="$(NFMDP_STUB_DumpExports)"
+        GenerateDependency="$(NFMDP_STUB_GenerateDependency)"
+        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
+        LoadHints="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
+        Compile="$(NanoFramework_IntermediateAssembly).pe"
+        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
+        GenerateSkeletonFile="$(NFMDP_STUB_GenerateSkeletonFile)"
+        GenerateSkeletonName="$(NFMDP_STUB_GenerateSkeletonName)"
+        GenerateSkeletonProject="$(NFMDP_STUB_GenerateSkeletonProject)"
+        SkeletonWithoutInterop="$(NFMDP_STUB_SkeletonWithoutInterop)"
+        ImportResources="@(NanoFramework_Resources)">
+      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
+      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
+    </MetaDataProcessorTask>
+
+    <CallTarget Targets="NanoGenerateBinaryOutput" />
+
+    <!-- Output native checksum to CI pipelines -->
+    <Message Text="##vso[task.setvariable variable=NF_NATIVE_ASSEMBLY_CHECKSUM;]$(NativeChecksum)"
+             Condition="'$(TF_BUILD)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
+    <WriteLinesToFile File="$(GITHUB_ENV)" Lines="NF_NATIVE_ASSEMBLY_CHECKSUM=$(NativeChecksum)"
+                      Condition="'$(GITHUB_ACTIONS)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
+  </Target>
+
+  <!-- ============================================================ -->
+  <!--  MetaDataProcessorCompile target (CORE ASSEMBLY)              -->
+  <!-- ============================================================ -->
+  <Target Name="MetaDataProcessorCompile"
+          DependsOnTargets="ResolveRuntimeDependencies"
+          Condition="'$(NFMDP_GENERATE_PE)' == 'true' and '$(NanoIsCoreLibrary)' == 'True'">
+
+    <PropertyGroup>
+      <NFMDP_STUB_GenerateSkeletonProject Condition="'$(NFMDP_STUB_GenerateSkeletonProject)' == ''">$(NanoGenerateSkeletonProjectName)</NFMDP_STUB_GenerateSkeletonProject>
+      <NFMDP_STUB_GenerateSkeletonName Condition="'$(NFMDP_STUB_GenerateSkeletonName)' == ''">$(NanoGenerateStubsRootName)</NFMDP_STUB_GenerateSkeletonName>
+      <NFMDP_STUB_GenerateSkeletonFile Condition="'$(NFMDP_STUB_GenerateSkeletonFile)' == ''">$(NanoGenerateSkeletonFile)</NFMDP_STUB_GenerateSkeletonFile>
+      <NFMDP_STUB_SkeletonWithoutInterop>true</NFMDP_STUB_SkeletonWithoutInterop>
+    </PropertyGroup>
+
+    <!-- Compile to PE (no stubs) -->
+    <MetaDataProcessorTask
+        Verbose="$(NFMDP_PE_Verbose)"
+        Parse="$(NFMDP_PE_Parse)"
+        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
+        Compile="$(NFMDP_PE_Compile)"
+        DumpMetadata="$(NFMDP_DUMP_METADATA)"
+        DumpExports="$(NFMDP_PE_DumpExports)"
+        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
+        GenerateDependency="$(NFMDP_PE_GenerateDependency)"
+        LoadHints="@(NFMDP_PE_LoadHints)"
+        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
+        Condition="'$(NFMDP_GENERATE_STUBS)' == 'false'">
+      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
+      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
+    </MetaDataProcessorTask>
+
+    <!-- Create STUB file -->
+    <MetaDataProcessorTask
+        Verbose="$(NFMDP_PE_Verbose)"
+        Parse="$(NFMDP_PE_Parse)"
+        IsCoreLibrary="$(NanoIsCoreLibrary)"
+        VerboseMinimize="$(NFMDP_PE_VerboseMinimize)"
+        Compile="$(NFMDP_PE_Compile)"
+        DumpMetadata="$(NFMDP_DUMP_METADATA)"
+        GenerateStubs="$(NFMDP_GENERATE_STUBS)"
+        GenerateSkeletonFile="$(NFMDP_STUB_GenerateSkeletonFile)"
+        GenerateSkeletonName="$(NFMDP_STUB_GenerateSkeletonName)"
+        GenerateSkeletonProject="$(NFMDP_STUB_GenerateSkeletonProject)"
+        SkeletonWithoutInterop="$(NFMDP_STUB_SkeletonWithoutInterop)"
+        LoadHints="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
+        ExcludeClassByName="@(NFMDP_PE_ExcludeClassByName)"
+        Condition="'$(NFMDP_GENERATE_STUBS)' == 'true'">
+      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
+      <Output TaskParameter="NativeChecksum" PropertyName="NativeChecksum" />
+    </MetaDataProcessorTask>
+
+    <!-- Output native checksum to CI pipelines -->
+    <Message Text="##vso[task.setvariable variable=NF_NATIVE_ASSEMBLY_CHECKSUM;]$(NativeChecksum)"
+             Condition="'$(TF_BUILD)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
+    <WriteLinesToFile File="$(GITHUB_ENV)" Lines="NF_NATIVE_ASSEMBLY_CHECKSUM=$(NativeChecksum)"
+                      Condition="'$(GITHUB_ACTIONS)' == 'True' and '$(NativeChecksum)' != '' and '$(NativeChecksum)' != '0x00000000'" />
+
+    <CallTarget Targets="CopyFilesToOutputDirectory" />
+    <CallTarget Targets="CopyNanoFrameworkFiles" />
+    <CallTarget Targets="CopyBackNanoFrameworkDlls" />
+  </Target>
+
+  <Target Name="NFMDP_CreateDatabaseAndDependencyMap" DependsOnTargets="MetaDataProcessorDat" />
+
+  <!-- Placeholder DAT target (full implementation for core builds) -->
+  <Target Name="MetaDataProcessorDat" Condition="'$(NFMDP_DAT_FILES)' == 'true'" />
+
+  <!-- ============================================================ -->
+  <!--  ResolveRuntimeDependencies                                   -->
+  <!-- ============================================================ -->
+  <Target Name="ResolveRuntimeDependencies">
+    <ResolveRuntimeDependenciesTask
+        Condition="'$(BuildingInsideVisualStudio)' == 'true'"
+        Assembly="$(NanoFramework_Assembly)$(TargetExt)"
+        AssemblyReferences="@(ReferencePath);@(ReferenceDependencyPaths);@(ReferenceSatellitePaths)"
+        StartProgram="$(NanoFramework_StartProgram)"
+        StartProgramReferences="@(NanoFramework_StartProgram_ResolvedFiles);@(NanoFramework_StartProgram_ResolvedDependencyFiles)" />
+  </Target>
+
+  <!-- ============================================================ -->
+  <!--  Resource and binary output targets                           -->
+  <!-- ============================================================ -->
+  <Target Name="NanoResourceGenerator"
+          Condition="'@(EmbeddedResource)' != ''">
+    <GenerateNanoResourceTask
+        Sources="@(EmbeddedResource)"
+        Condition="'%(EmbeddedResource.Type)' == 'Resx' and '%(EmbeddedResource.GenerateResource)' != 'false'"
+        References="@(ReferencePath)"
+        UseSourcePath="$(UseSourcePath)"
+        StateFile="$(IntermediateOutputPath)$(MSBuildProjectFile).NanoResourceGenerator.Cache"
+        OutputResources="@(EmbeddedResource->'$(ProjectDir)$(IntermediateOutputPath)%(ManifestResourceName).nanoresources')">
+      <Output TaskParameter="OutputResources" ItemName="NanoFramework_Resources" />
+      <Output TaskParameter="FilesWritten" ItemName="FileWrites" />
+    </GenerateNanoResourceTask>
+  </Target>
+
+  <Target Name="NanoGenerateBinaryOutput"
+          DependsOnTargets="ResolveReferences">
+    <GenerateBinaryOutputTask
+        AssemblyPE="$(NanoFramework_IntermediateAssembly).pe"
+        Assembly="$(NanoFramework_Assembly)$(TargetExt)"
+        AssemblyReferences="@(ReferencePath);@(ReferenceDependencyPaths)">
+      <Output TaskParameter="FileWritten" ItemName="FileWrites" />
+    </GenerateBinaryOutputTask>
+  </Target>
+
+  <!-- Clean extra files for core assembly builds -->
+  <Target Name="NanoCLR_CleanExtraFiles" Condition="'$(NanoIsCoreLibrary)' == 'True'">
+    <Delete Files="$(NFMDP_PE_Compile);$(NFMDP_PE_Compile_NoExt).pdbx;$(NFMDP_PE_DumpExports);$(NFMDP_PE_GenerateDependency)"
+            TreatErrorsAsWarnings="true" />
+  </Target>
+
+  <!-- Suppress manifest/config copy -->
+  <Target Name="_CopyManifestFiles" />
+  <Target Name="_CopyApplicationConfigFiles" />
+
+</Project>
diff --git a/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Tfm.props b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Tfm.props
new file mode 100644
index 0000000..3696813
--- /dev/null
+++ b/src/nanoFramework.NET.Sdk/Sdk/nanoFramework.Tfm.props
@@ -0,0 +1,72 @@
+<Project>
+  <!--
+    nanoFramework.Tfm.props — the nanoFramework target-framework identity.
+
+    Imported from Sdk.props AFTER the Microsoft.NET.Sdk import, so it overrides
+    whatever the .NET SDK inferred for our custom TFM. Holds the netnano1.0 moniker,
+    the .NETnanoFramework identity, and the compiler/TFM-shaping props that suppress
+    standard .NET reference resolution (there is no netnano1.0 targeting pack and
+    nanoFramework ships its own mscorlib).
+
+    Import paths use $(MSBuildThisFileDirectory) so they resolve inside the packed SDK.
+  -->
+
+  <!-- ============================================================ -->
+  <!--  Default TargetFramework                                      -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">netnano1.0</TargetFramework>
+
+    <!-- Disable .NET framework reference resolution — nanoFramework has its own mscorlib -->
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+
+    <!--
+      Existing nanoFramework NuGet packages place files in a flat lib\ directory
+      (no TFM subfolder). NuGet interprets those as ".NETFramework,Version=v0.0".
+      AssetTargetFallback tells NuGet: if no netnano1.0 assets exist, accept "net" assets.
+    -->
+    <AssetTargetFallback Condition="'$(AssetTargetFallback)' == ''">net</AssetTargetFallback>
+
+    <!-- Suppress NU1701 warning for the expected fallback -->
+    <NoWarn>$(NoWarn);NU1701</NoWarn>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  nanoFramework Target Framework Identity                      -->
+  <!--  (override whatever Microsoft.NET.Sdk inferred)               -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETnanoFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+    <TargetFrameworkMoniker>.NETnanoFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
+    <TargetFrameworkMonikerDisplayName>.NET nanoFramework 1.0</TargetFrameworkMonikerDisplayName>
+    <NuGetTargetMoniker>.NETnanoFramework,Version=$(TargetFrameworkVersion)</NuGetTargetMoniker>
+  </PropertyGroup>
+
+  <!-- ============================================================ -->
+  <!--  C# Compiler settings for nanoFramework                       -->
+  <!-- ============================================================ -->
+  <PropertyGroup>
+    <LangVersion Condition="'$(LangVersion)' == ''">13.0</LangVersion>
+
+    <!-- Prevent standard .NET library references — nanoFramework provides its own mscorlib -->
+    <NoStdLib>true</NoStdLib>
+    <NoCompilerStandardLib>true</NoCompilerStandardLib>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+
+    <!-- Disable .NET Framework-specific features -->
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
+
+    <!-- Required for Roslyn to compile without a standard class library -->
+    <TargetingClr2Framework>true</TargetingClr2Framework>
+
+    <!--
+      Point framework directories to the SDK folder (which has no .NET assemblies).
+      Prevents the compiler from accidentally resolving standard .NET types.
+    -->
+    <_TargetFrameworkDirectories>$(_NfSdkDir)</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(_NfSdkDir)</_FullFrameworkReferenceAssemblyPaths>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/nanoFramework.NET.Sdk/nanoFramework.NET.Sdk.csproj b/src/nanoFramework.NET.Sdk/nanoFramework.NET.Sdk.csproj
index 7f6b522..334a3c8 100644
--- a/src/nanoFramework.NET.Sdk/nanoFramework.NET.Sdk.csproj
+++ b/src/nanoFramework.NET.Sdk/nanoFramework.NET.Sdk.csproj
@@ -56,6 +56,11 @@
       Sdk/
         Sdk.props
         Sdk.targets
+        nanoFramework.Tfm.props
+        nanoFramework.Mdp.targets
+        nanoFramework.Capabilities.targets
+        Rules/
+          NanoDebugger.xaml
       tasks/
         net472/
           nanoFramework.Tools.BuildTasks.dll
@@ -73,10 +78,18 @@
       <PackagePath>\</PackagePath>
     </None>
 
-    <!-- SDK props/targets -->
+    <!-- SDK props/targets (thin orchestrators) -->
     <None Include="Sdk\Sdk.props" Pack="true" PackagePath="Sdk" />
     <None Include="Sdk\Sdk.targets" Pack="true" PackagePath="Sdk" />
 
+    <!-- SDK modules (focused includes imported by the orchestrators above) -->
+    <None Include="Sdk\nanoFramework.Tfm.props" Pack="true" PackagePath="Sdk" />
+    <None Include="Sdk\nanoFramework.Mdp.targets" Pack="true" PackagePath="Sdk" />
+    <None Include="Sdk\nanoFramework.Capabilities.targets" Pack="true" PackagePath="Sdk" />
+
+    <!-- Debugger property-page rule (NanoDebugger flavor) — surfaced via PropertyPageSchema in Sdk.targets -->
+    <None Include="Sdk\Rules\NanoDebugger.xaml" Pack="true" PackagePath="Sdk\Rules" />
+
     <!-- Build task DLLs for full-framework MSBuild (VS / msbuild.exe) -->
     <None Include="..\nanoFramework.Tools.BuildTasks\bin\$(Configuration)\net472\nanoFramework.Tools.BuildTasks.dll" Pack="true" PackagePath="tasks\net472" />
     <None Include="..\nanoFramework.Tools.BuildTasks\bin\$(Configuration)\net472\nanoFramework.Tools.BuildTasks.pdb" Pack="true" PackagePath="tasks\net472" Condition="Exists('..\nanoFramework.Tools.BuildTasks\bin\$(Configuration)\net472\nanoFramework.Tools.BuildTasks.pdb')" />
diff --git a/src/nanoFramework.Tools.BuildTasks/nanoFramework.Tools.BuildTasks.csproj b/src/nanoFramework.Tools.BuildTasks/nanoFramework.Tools.BuildTasks.csproj
index 27ae288..9a1558e 100644
--- a/src/nanoFramework.Tools.BuildTasks/nanoFramework.Tools.BuildTasks.csproj
+++ b/src/nanoFramework.Tools.BuildTasks/nanoFramework.Tools.BuildTasks.csproj
@@ -9,8 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.12.6" PrivateAssets="all" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.14.28" PrivateAssets="all" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.28" PrivateAssets="all" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <!-- System.Drawing is needed for resource processing (bitmap handling in GenerateNanoResourceTask) -->
diff --git a/test/SmokeTest/NuGet.Config b/test/SmokeTest/NuGet.Config
index c847b9c..1339017 100644
--- a/test/SmokeTest/NuGet.Config
+++ b/test/SmokeTest/NuGet.Config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="local-sdk" value="../../artifacts" />
+    <add key="local-sdk" value="../../src/nanoFramework.NET.Sdk/bin/Release" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>