Feedback changes on #80 (#84)

* Getting Ready for feedback Fix Local Build Fix NuSpec less packaging Upstream (build env) patches - SourceControlInformation fix - Add some Labels * Removed _SdkVisualStudioVersion workaround No Longer needed since we need VS/MSBuild 15 and above Silverlight and WP targets are not affected! * Privatized ('_' prefix) internal variable names So that we won't clash with other names that matches these! * clean up Inference targets upstream patch for Identifier check comments clean up * Update Desktop Items upstream patch: fixed EmbeddedResource Added section comments * Added WPF 'tmp_proj' workaround back Some people really need it!!! And no, they don't want to update to net472 * Updated VS Project System support upstream patches: Added Nesting and Dependent files support Workaround for CodeAnalysis, Intellisense, etc... * Build env updates Move packaging related props * WPF/WFF tmp ptoject workaround updates Use '_TargetAssemblyProjectName' Generalize Fixup target Drop '_Sdk' for user facing properties. * Update Project System Support Take 2: DynamicDependentFile not working, keep static evaluation for now! Include missing ProjectSystem.targets file * Prefix '_' to 'IsGeneratedProject' property Since, IsGeneratedProject is not supposed to be a user facing property! * Finalize LanguageTargets Remove Test Hooks Give a common property * Make 'MSBuild:Compile' into a property just like every other custom tool so that we can keep track of it! * Warn when using MSBuild Core for projects that require full MSBuild! * Compat with oboslete properties Issue a warning when using those properties * Add docs for using the SDK For now it only includes migration path from old SDK version. * Update placeholder URL Will work once the PR is merged * Fix condition on using MSBuild Core target Just a little fix
novotnyllc · Jun 24, 2018 · f77f39f · f77f39f
1 parent 7af6f17
commit f77f39f
Show file tree

Hide file tree

Showing 43 changed files with 501 additions and 176 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,6 +6,7 @@ root = true
 
 # Don't use tabs for indentation.
 [*]
+charset = utf-8
 indent_style = space
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
@@ -17,7 +18,10 @@ indent_size = 4
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
-charset = utf-8-bom
+
+# Script files
+[*.{cmd,bat,ps1}]
+indent_size = 4
 
 # Xml project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]

diff --git a/Directory.Build.rsp b/Directory.Build.rsp
@@ -1,6 +1,6 @@
 /MaxCPUCount
 /BinaryLogger
 /DetailedSummary
-/Verbosity:minimal
+/Verbosity:normal
 /NodeReuse:false
 /Restore
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -6,6 +6,6 @@
     <DefaultItemExcludes>$(DefaultItemExcludes)$(_ProjectItemExcludes)</DefaultItemExcludes>
   </PropertyGroup>
 
-  <Import Project="$(BuildToolsPath)MSBuild.OutputPathChecks.targets"/>
+  <Import Project="$(BuildToolsPath)MSBuild.OutputPathChecks.targets" Label="OutputPaths"/>
 
 </Project>
diff --git a/Docs/Using-Extras-SDK.md b/Docs/Using-Extras-SDK.md
@@ -0,0 +1,64 @@
+# Using the Extras Sdk
+
+## Migrate from previous versions
+
+If you're using v1.6+ of the Extras SDK, then you would know that few properties have been changed, and the help is provided as a warning to use the new property names.
+
+If you're not using the new version, and/or wish to migrate your build system to support this version, here are the instructions to do just that:
+
+0. BACK UP! BACK UP! (if you're not using version control)
+
+1. First remove any workarounds (check the closed issues first) that you've applied using the previous Extras SDK version.
+
+2. If you're using Visual Studio IDE v15.6+ (if you can update, then update) and use SDK style.
+
+Your project diff:
+
+```diff
+- <Project Sdk="Microsoft.NET.Sdk">
++ <Project Sdk="MSBuild.Sdk.Extras">
+  <!-- OTHER PROPERTIES -->
+  <PropertyGroup>
+    <TargetFrameworks>net46;uwp10.0;tizen40</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.0" PrivateAssets="All"/>
+  <!-- OTHER PACKAGES/INCLUDES -->
+  </ItemGroup>
+
+-  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')"/>
+  <!-- OTHER IMPORTS -->
+</Project>
+```
+
+```diff
+- PackageReference style
++ SDK style
+```
+
+More info: [ReadMe](../README.md)
+
+3. Remove any UWP/Tizen package referneces as they are implicitly included if you're using SDK style.
+
+4. Rename these properties to the new ones
+
+### User facing properties
+
+| OLD Property                                    | NEW Property/Behaviour                                             |
+| ---                                             | ----                                                               |
+| `ExtrasSkipLibraryLayout`                       | `SkipWindowsLibraryLayout`                                         |
+| `_SdkSetAndroidResgenFile`                      | `IncludeAndroidResgenFile`                                         |
+| `SuppressWarnIfOldSdkPack`                      | `IgnoreOldSdkWarning`                                              |
+| `ExtrasUwpMetaPackageVersion`                   | `_ImplicitPlatformPackageVersion` + `TargetFramework` condition    |
+| `ExtrasImplicitPlatformPackageDisabled`         | `DisableImplicitFrameworkReferences` + `TargetFramework` condition |
+| `ExtrasImplicitPlatformPackageIsPrivate`        | Auto set for library like items                                    |
+| `EmbeddedResourceGeneratorVisibilityIsInternal` | opposite of `EmbeddedResourceGeneratedCodeIsPublic`                |
+
+5. If you're using it for WinForms/WPF, you can set `EnableWpfProjectSetup`/`EnableWinFormsProjectSetup` to `true` to include required references and default items.
+
+6. That's it you're done! If you find any issues during build, check with the [Templates/TestProjects](../TestProjects) included and create an issue if that doesn't help.
+
+## Customizing your Build setup
+
+TBD
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -2,22 +2,17 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\$(MSBuildThisFile)"/>
 
-  <Import Project="$(BuildToolsPath)MSBuild.OutputPaths.props"/>
+  <Import Project="$(BuildToolsPath)MSBuild.OutputPaths.props" Label="OutputPaths"/>
 
-  <PropertyGroup>
+  <PropertyGroup Label="Output">
     <PublishFolder>~Packages</PublishFolder>
   </PropertyGroup>
 
   <PropertyGroup Label="OutputPaths">
     <CustomBeforeSdkTargets>$(BuildToolsPath)MSBuild.OutputPaths.targets</CustomBeforeSdkTargets>
   </PropertyGroup>
 
-  <PropertyGroup Label="Build">
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <PackOnBuild>true</PackOnBuild>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+  <Import Project="$(BuildToolsPath)MSBuild.Packaging.props"/>
 
   <PropertyGroup Label="PackageInfo">
     <Authors>Oren Novotny</Authors>

diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(BuildToolsPath)MSBuild.Packaging.targets" Condition="'$(IncludeBuildOutput)' == 'false'"/>
+  <Import Project="$(BuildToolsPath)MSBuild.Packaging.targets"/>
 
   <Import Project="$(MSBuildThisFileDirectory)..\$(MSBuildThisFile)"/>
 
@@ -12,14 +12,8 @@
   <Import Project="$(BuildToolsPath)MSBuild.DevLocal.targets" Condition="'$(IsCloudBuild)' != 'true'"/>
 
   <ItemGroup Condition="'$(IsCloudBuild)' == 'true'">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All"/>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="All"/>
   </ItemGroup>
 
-  <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
-  </ItemGroup>
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/CheckMissing.targets
@@ -5,14 +5,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SdkFallbackLanguageTargets Condition="'$(IsMultiTargetingBuild)' != 'true'">$(MSBuildToolsPath)\Microsoft.Common.CurrentVersion.targets</_SdkFallbackLanguageTargets>
-    <_SdkFallbackLanguageTargets Condition="'$(IsMultiTargetingBuild)' == 'true'">$(MSBuildToolsPath)\Microsoft.Common.CrossTargeting.targets</_SdkFallbackLanguageTargets>
+    <_SdkFallbackLanguageTargets>$(MSBuildToolsPath)\Microsoft.Common.targets</_SdkFallbackLanguageTargets>
   </PropertyGroup>
 
   <!-- Import the fallback targets so the NuGet restore succeeds -->
   <Import Project="$(_SdkFallbackLanguageTargets)" Condition="Exists('$(_SdkFallbackLanguageTargets)')"/>
 
-  <Target Name="ShowMissingLanguageTargetsError" BeforeTargets="_CheckForUnsupportedTargetFramework">
+  <Target Name="_ShowMissingLanguageTargetsError" BeforeTargets="_CheckForUnsupportedTargetFramework" Condition="'$(_IgnoreMissingLanguageTargetsError)' != 'true'">
     <Error Condition="'$(_ShortFrameworkIdentifier)' != 'portable'" Text="The specified language targets for $(TargetFramework) is missing. Ensure correct tooling is installed for '$(_ShortFrameworkIdentifier)'"/>
     <Error Condition="'$(_ShortFrameworkIdentifier)' == 'portable'" Text="The specified TFM '$(TargetFramework)' is not valid. Check that it's a valid combination: https://portablelibraryprofiles.stephencleary.com/"/>
   </Target>

diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Desktop.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Desktop.targets
@@ -4,20 +4,27 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <!--
-    Only MSBuild Framework build includes Microsoft.Xaml.targets which redirects to MSBuildFrameworkToolsPath.
-    So to have Xaml Support, we need to use those targets instead of .NETCoreSdk targets
-  -->
-  <PropertyGroup Condition="$(_SdkDesktopTargets) == ''">
-    <_SdkDesktopTargets Condition="'$(_LanguageSourceName)' != 'FSharp'">$(MSBuildExtensionsPath)\$(_SdkVisualStudioVersion)\Bin\Microsoft.$(_LanguageSourceName).targets</_SdkDesktopTargets>
-    <_SdkDesktopTargets Condition="'$(_LanguageSourceName)' == 'FSharp'">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(_SdkVisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</_SdkDesktopTargets>
+  <PropertyGroup Condition="'$(MicrosoftNETSdkTargetsPath)' == ''">
+    <MicrosoftNETSdkTargetsPath>$(ToolDepsJsonGeneratorProject.TrimEnd('GenerateDeps\GenerateDeps.proj'))</MicrosoftNETSdkTargetsPath>
+    <MicrosoftNETSdkTargetsPath Condition="!Exists('$(MicrosoftNETSdkTargetsPath)')">$(_NugetFallbackFolder.TrimEnd('..\..\..\..\NuGetFallbackFolder'))</MicrosoftNETSdkTargetsPath>
+    <MicrosoftNETSdkTargetsPath Condition="!Exists('$(MicrosoftNETSdkTargetsPath)')">$(NETCoreSdkBundledVersionsProps.TrimEnd('..\..\..\Microsoft.NETCoreSdk.BundledVersions.props'))</MicrosoftNETSdkTargetsPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(_FSharpTargetsPath)' == ''">
+    <_FSharpTargetsPath>$(MicrosoftNETSdkTargetsPath)Microsoft.NET.Sdk.FSharpTargetsShim.targets</_FSharpTargetsPath>
+    <_FSharpTargetsPath Condition="!Exists('$(_FSharpTargetsPath)')">$(MicrosoftNETSdkTargetsPath)Microsoft.NET.Sdk.FSharp.targets</_FSharpTargetsPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_SdkLanguageTargets Condition="'$(_LanguageSourceName)' != 'FSharp'">$(MSBuildToolsPath)\Microsoft.$(_LanguageSourceName).targets</_SdkLanguageTargets>
+    <_SdkLanguageTargets Condition="'$(_LanguageSourceName)' == 'FSharp'">$(_FSharpTargetsPath)</_SdkLanguageTargets>
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkDesktopTargets)')">true</_SdkLanguageTargetsMissing>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
   </PropertyGroup>
 
-  <Import Project="$(_SdkDesktopTargets)" Condition="Exists('$(_SdkDesktopTargets)')"/>
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
   <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Portable.targets
@@ -4,16 +4,16 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(_SdkPortableTargets) == ''">
-    <_SdkPortableTargets Condition="'$(_LanguageSourceName)' != 'FSharp'">$(MSBuildExtensionsPath)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(_LanguageSourceName).targets</_SdkPortableTargets>
-    <_SdkPortableTargets Condition="'$(_LanguageSourceName)' == 'FSharp'">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(_SdkVisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets</_SdkPortableTargets>
+  <PropertyGroup>
+    <_SdkLanguageTargets Condition="'$(_LanguageSourceName)' != 'FSharp'">$(MSBuildExtensionsPath)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(_LanguageSourceName).targets</_SdkLanguageTargets>
+    <_SdkLanguageTargets Condition="'$(_LanguageSourceName)' == 'FSharp'">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets</_SdkLanguageTargets>
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkPortableTargets)')">true</_SdkLanguageTargetsMissing>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
   </PropertyGroup>
 
-  <Import Project="$(_SdkPortableTargets)" Condition="Exists('$(_SdkPortableTargets)')"/>
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
   <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Silverlight.targets
@@ -7,11 +7,17 @@
   <PropertyGroup>
     <!-- HACK: $(MSBuildExtensionsPath) for VS <= 14.0 -->
     <_SdkMSBuildExtensionsPath>$(MSBuildProgramFiles32)\MSBuild</_SdkMSBuildExtensionsPath>
-    <_SdkSilverlightTargets Condition="'$(_SdkSilverlightTargets)' == ''">$(_SdkMSBuildExtensionsPath)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.$(_LanguageSourceName).targets</_SdkSilverlightTargets>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkSilverlightTargets)')">true</_SdkLanguageTargetsMissing>
   </PropertyGroup>
 
-  <Import Project="$(_SdkSilverlightTargets)" Condition="Exists('$(_SdkSilverlightTargets)')"/>
+  <PropertyGroup>
+    <_SdkLanguageTargets>$(_SdkMSBuildExtensionsPath)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.$(_LanguageSourceName).targets</_SdkLanguageTargets>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
+  </PropertyGroup>
+
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
   <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets
@@ -5,11 +5,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SdkWindowsTargets Condition="'$(_SdkWindowsTargets)' == ''">$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(_SdkVisualStudioVersion)\Microsoft.Windows.UI.Xaml.$(_LanguageSourceName).targets</_SdkWindowsTargets>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkWindowsTargets)')">true</_SdkLanguageTargetsMissing>
+    <_SdkLanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.$(_LanguageSourceName).targets</_SdkLanguageTargets>
   </PropertyGroup>
 
-  <Import Project="$(_SdkWindowsTargets)" Condition="Exists('$(_SdkWindowsTargets)')"/>
+  <PropertyGroup>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
+  </PropertyGroup>
+
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
   <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/WindowsPhone.targets
@@ -7,15 +7,19 @@
   <PropertyGroup>
     <!-- HACK: $(MSBuildExtensionsPath) for VS <= 14.0 -->
     <_SdkMSBuildExtensionsPath>$(MSBuildProgramFiles32)\MSBuild</_SdkMSBuildExtensionsPath>
-    <_SdkWindowsPhoneOverridesTargets Condition="'$(_SdkWindowsPhoneOverridesTargets)' == ''">$(_SdkMSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets</_SdkWindowsPhoneOverridesTargets>
-    <_SdkWindowsPhoneTargets Condition="'$(_SdkWindowsPhoneTargets)' == ''">$(_SdkMSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(_LanguageSourceName).targets</_SdkWindowsPhoneTargets>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkWindowsPhoneTargets)')">true</_SdkLanguageTargetsMissing>
   </PropertyGroup>
 
-  <ImportGroup>
-    <Import Project="$(_SdkWindowsPhoneOverridesTargets)" Condition="Exists('$(_SdkWindowsPhoneOverridesTargets)')"/>
-    <Import Project="$(_SdkWindowsPhoneTargets)" Condition="Exists('$(_SdkWindowsPhoneTargets)')"/>
-    <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
-  </ImportGroup>
+  <PropertyGroup>
+    <_SdkLanguageTargets>$(_SdkMSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(_LanguageSourceName).targets</_SdkLanguageTargets>
+    <_SdkLanguageOverridesTargets>$(_SdkMSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets</_SdkLanguageOverridesTargets>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
+  </PropertyGroup>
+
+  <Import Project="$(_SdkLanguageOverridesTargets)" Condition="Exists('$(_SdkLanguageOverridesTargets)')"/>
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
+  <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
 </Project>
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets
@@ -20,15 +20,15 @@
     <_SdkTargetsImportType Condition="'$(IsApplePlatform)' == 'true'">ObjCBinding.$(_LanguageSourceName)</_SdkTargetsImportType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(_SdkXamarinPlatformTargets)' == ''">
-    <_SdkXamarinPlatformTargets>$(MSBuildExtensionsPath)\Xamarin\$(_SdkTargetPlatformName)\Xamarin.$(_SdkTargetPlatformName).$(_SdkTargetsImportType).targets</_SdkXamarinPlatformTargets>
+  <PropertyGroup>
+    <_SdkLanguageTargets>$(MSBuildExtensionsPath)\Xamarin\$(_SdkTargetPlatformName)\Xamarin.$(_SdkTargetPlatformName).$(_SdkTargetsImportType).targets</_SdkLanguageTargets>
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkXamarinPlatformTargets)')">true</_SdkLanguageTargetsMissing>
+    <_SdkLanguageTargetsMissing Condition="!Exists('$(_SdkLanguageTargets)')">true</_SdkLanguageTargetsMissing>
   </PropertyGroup>
 
-  <Import Project="$(_SdkXamarinPlatformTargets)" Condition="Exists('$(_SdkXamarinPlatformTargets)')"/>
+  <Import Project="$(_SdkLanguageTargets)" Condition="Exists('$(_SdkLanguageTargets)')"/>
   <Import Project="$(MSBuildThisFileDirectory)CheckMissing.targets" Condition="'$(_SdkLanguageTargetsMissing)' == 'true'"/>
 
   <!-- CSharp is the only language supported for Binding Projects for Now -->

diff --git a/Source/MSBuild.Sdk.Extras/Build/MSBuild.NET.Extras.Sdk.props b/Source/MSBuild.Sdk.Extras/Build/MSBuild.NET.Extras.Sdk.props
@@ -27,7 +27,7 @@
     </When>
 
     <Otherwise>
-      <PropertyGroup>
+      <PropertyGroup Condition="'$(_LanguageSourceName)' == ''">
         <_LanguageSourceName>Common</_LanguageSourceName>
         <!--<DefaultLanguageSourceExtension>.msil</DefaultLanguageSourceExtension>-->
       </PropertyGroup>
@@ -40,6 +40,10 @@
     <SupportedCultures Condition="'$(SupportedCultures)' == ''">$(DefaultLanguage)</SupportedCultures>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == '' OR '$(VisualStudioVersion)' &lt; '14.0'">15.0</VisualStudioVersion>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(AppDesignerFolder)' == ''">
     <AppDesignerFolder Condition="'$(_LanguageSourceName)' != 'VisualBasic'">Properties</AppDesignerFolder>
     <AppDesignerFolder Condition="'$(_LanguageSourceName)' == 'VisualBasic'">My Project</AppDesignerFolder>

diff --git a/Source/MSBuild.Sdk.Extras/Build/MSBuild.NET.Extras.Sdk.targets b/Source/MSBuild.Sdk.Extras/Build/MSBuild.NET.Extras.Sdk.targets
@@ -4,15 +4,12 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\Build\MSBuild.Sdk.ExtrasShim.targets" Condition="'$(DisableExtrasSdkLegacyCompat)' != 'true'"/>
+
   <PropertyGroup Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == ''">
     <IsMultiTargetingBuild>true</IsMultiTargetingBuild>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <_SdkVisualStudioVersion>$(VisualStudioVersion)</_SdkVisualStudioVersion>
-    <_SdkVisualStudioVersion Condition="'$(_SdkVisualStudioVersion)' == '' OR '$(_SdkVisualStudioVersion)' &lt; '14.0'">15.0</_SdkVisualStudioVersion>
-  </PropertyGroup>
-
   <ImportGroup Condition="'$(IsMultiTargetingBuild)' != 'true'">
     <Import Project="$(MSBuildThisFileDirectory)MSBuild.NET.Inference.targets"
             Condition="'$(TargetFramework)' != '' AND !($(TargetFramework.Contains(',')) OR $(TargetFramework.Contains(';')))"/>
@@ -25,5 +22,6 @@
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\DefaultItems\MSBuild.NET.DefaultItems.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\ProjectSystem\MSBuild.NET.ProjectSystem.targets"/>
 
 </Project>