Update to MSBuild.Sdk.Extras 1.6.55

antlr · Oct 1, 2018 · a6e7406 · a6e7406
1 parent 993c736
commit a6e7406
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/Antlr3.StringTemplate/Antlr3.StringTemplate.csproj b/Antlr3.StringTemplate/Antlr3.StringTemplate.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net35-client;net40-client;netstandard2.0</TargetFrameworks>
@@ -17,10 +17,6 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="DisableCrazyPackageDeletion" BeforeTargets="Clean">
     <PropertyGroup>
       <GeneratePackageValue>$(GeneratePackageOnBuild)</GeneratePackageValue>
@@ -83,5 +79,4 @@
     </Compile>
   </ItemGroup>
 
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>
diff --git a/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj b/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net35-client;net40-client;netstandard1.3</TargetFrameworks>
@@ -16,10 +16,6 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="DisableCrazyPackageDeletion" BeforeTargets="Clean">
     <PropertyGroup>
       <GeneratePackageValue>$(GeneratePackageOnBuild)</GeneratePackageValue>
@@ -64,5 +60,4 @@
     </Compile>
   </ItemGroup>
 
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>
diff --git a/Runtime/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj b/Runtime/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net20;net40-client;netstandard2.0</TargetFrameworks>
@@ -16,10 +16,6 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="DisableCrazyPackageDeletion" BeforeTargets="Clean">
     <PropertyGroup>
       <GeneratePackageValue>$(GeneratePackageOnBuild)</GeneratePackageValue>
@@ -41,5 +37,4 @@
     <ProjectReference Include="..\Antlr3.Runtime\Antlr3.Runtime.csproj" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>
diff --git a/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj b/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net20;net40-client;portable-net40+sl5+win8+wp8+wpa81;netstandard1.1</TargetFrameworks>
@@ -16,10 +16,6 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="DisableCrazyPackageDeletion" BeforeTargets="Clean">
     <PropertyGroup>
       <GeneratePackageValue>$(GeneratePackageOnBuild)</GeneratePackageValue>
@@ -45,5 +41,4 @@
     </When>
   </Choose>
 
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.6.55"
+  }
+}