Update package versions (#96)

jeffkl · web-flow · commit c198a74397ea · 2019-05-24T08:22:33.000-07:00
Target net46 and net472 for Artifacts so it can reference newer MSBuild
diff --git a/Packages.props b/Packages.props
@@ -10,18 +10,18 @@
 
   <ItemGroup>
     <PackageReference Update="MicroBuild.Core" Version="0.3.0" />
-    <PackageReference Update="Microsoft.Build" Version="15.9.20" />
-    <PackageReference Update="Microsoft.Build.Framework" Version="15.9.20" />
-    <PackageReference Update="Microsoft.Build.Utilities.Core" Version="15.9.20" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Update="MSBuild.ProjectCreation" Version="1.2.10" />
+    <PackageReference Update="Microsoft.Build" Version="16.0.461" />
+    <PackageReference Update="Microsoft.Build.Framework" Version="16.0.461" />
+    <PackageReference Update="Microsoft.Build.Utilities.Core" Version="16.0.461" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Update="MSBuild.ProjectCreation" Version="1.2.11" />
     <PackageReference Update="Shouldly" Version="3.0.2" />
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.3.138" Condition=" '$(EnableGitVersioning)' != 'false' " />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.3.151" Condition=" '$(EnableGitVersioning)' != 'false' " />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(EnableStyleCop)' != 'false' ">
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Microsoft.Build.CentralPackageVersions": "2.0.1",
+    "Microsoft.Build.CentralPackageVersions": "2.0.36",
     "Microsoft.Build.NoTargets": "1.0.53",
     "Microsoft.Build.Traversal": "1.0.52"
   }
diff --git a/samples/CentralPackageVersions/Directory.Build.targets b/samples/CentralPackageVersions/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.26" />
+  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.36" />
 </Project>
diff --git a/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj b/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.Build.NoTargets/1.0.40">
+﻿<Project Sdk="Microsoft.Build.NoTargets/1.0.53">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
diff --git a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Artifacts/Microsoft.Build.Artifacts.csproj b/src/Artifacts/Microsoft.Build.Artifacts.csproj
@@ -1,16 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net46;net472;netcoreapp2.1</TargetFrameworks>
     <BuildOutputTargetFolder>build\</BuildOutputTargetFolder>
     <EnableDefaultNoneItems>true</EnableDefaultNoneItems>
     <PackageLicenseFile></PackageLicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <DevelopmentDependency>true</DevelopmentDependency>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'net46'">
+    <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All"  />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+    <PackageReference Include="Microsoft.Build.Framework;
+                               Microsoft.Build;
+                               Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All" VersionOverride="15.9.20" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/UnitTest.Common/UnitTest.Common.csproj b/src/UnitTest.Common/UnitTest.Common.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "Microsoft.Build.CentralPackageVersions": "2.0.1",`
	`3`	`+ "Microsoft.Build.CentralPackageVersions": "2.0.36",`
`4`	`4`	`"Microsoft.Build.NoTargets": "1.0.53",`
`5`	`5`	`"Microsoft.Build.Traversal": "1.0.52"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.Build.NoTargets/1.0.40">`
	`1`	`+<Project Sdk="Microsoft.Build.NoTargets/1.0.53">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<TargetFramework>netcoreapp2.0</TargetFramework>`