Demonstrate removing SDK from .csproj

eerhardt · May 22, 2018 · ed3c014 · eerhardt · May 22, 2018 · ed3c014
1 parent eef01a9
commit ed3c014
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,6 +2,13 @@
 
   <Import Project="..\Directory.Build.props" />
 
+  <PropertyGroup>
+    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+  </PropertyGroup>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Not all types and members have XML docs yet.

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -20,4 +20,6 @@
 
   </Target>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
 </Project>
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+  <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -11,4 +12,5 @@
     <Folder Include="Properties\" />
   </ItemGroup>
 
+  <Import Project="..\Directory.Build.targets" />
 </Project>
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+  <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -20,4 +21,5 @@
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
   </ItemGroup>
 
+  <Import Project="..\Directory.Build.targets" />
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,6 @@

		</Target>

		<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

		</Project>