Target newer frameworks and SDKs

Also drop MSBuild.Sdk.Extras

azure-pipelines.yml

@@ -1,8 +1,9 @@
 trigger:
   branches:
-    include: ["master"]
+    include:
+    - master
   paths:
-    exclude: ["doc", "*.md", ".appveyor.yml", ".travis.yml"]
+    exclude: ["doc", "*.md"]
 
 variables:
 #  TreatWarningsAsErrors: true
@@ -12,7 +13,7 @@ variables:
 
 jobs:
 - job: Windows
-  pool: Hosted VS2017
+  pool: Hosted Windows 2019 with VS2019
   steps:
   - script: |
       dotnet tool install --tool-path . nbgv
@@ -35,7 +36,7 @@ jobs:
   # Use VSBuild on Windows so GitLink will work (it fails on dotnet build)
   - task: VSBuild@1
     inputs:
-      vsVersion: 15.0
+      vsVersion: "16.0"
       msbuildArgs: /t:build,pack /m /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)

src/Directory.Build.targets

@@ -4,15 +4,16 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
-    <PackageReference Update="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
     <PackageReference Update="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" />
+    <PackageReference Update="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
+    <PackageReference Update="Microsoft.Build" Version="14.3.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Update="System.Diagnostics.Contracts" Version="4.3.0" />
-    <PackageReference Update="Validation" Version="2.4.18" />
-    <PackageReference Update="Microsoft.Build" Version="14.3.0" />
-    <PackageReference Update="xunit" Version="2.3.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Update="Validation" Version="2.4.22" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Update="xunit" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Update="dotnet-codegen" Version="$(CodeGenerationRoslynVersion)" />

src/ImmutableObjectGraph.Generation.Attributes/ImmutableObjectGraph.Generation.Attributes.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>ImmutableObjectGraph.Generation</RootNamespace>
-    <TargetFrameworks>netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Description>The runtime components behind the types generated with the ImmutableObjectGraph.Generation package.</Description>
 
     <!-- This gets included in ImmutableObjectGraph.Generation -->

src/ImmutableObjectGraph.Generation.Tests/ImmutableObjectGraph.Generation.Tests.csproj

@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFrameworks>net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="TestSources\AbstractClassMidTypeHierarchyWithRequiredField.cs">
@@ -85,6 +82,7 @@
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="CodeGeneration.Roslyn" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
@@ -95,4 +93,4 @@
     <ProjectReference Include="..\ImmutableObjectGraph.Generation\ImmutableObjectGraph.Generation.csproj" />
     <ProjectReference Include="..\ImmutableObjectGraph\ImmutableObjectGraph.csproj" />
   </ItemGroup>
-</Project>
+</Project>

src/ImmutableObjectGraph.Generation/ImmutableObjectGraph.Generation.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>ImmutableObjectGraph.Generation</RootNamespace>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>MSBuild-based code generator to transform simple mutable type definitions into fully functional immutable types with persistent characteristics.</Description>
 
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -57,4 +57,4 @@
       <NuspecProperties>id=$(PackageId);version=$(NuGetPackageVersion);authors=$(Authors);copyright=$(Copyright);tags=$(PackageTags);requireLicenseAcceptance=$(PackageRequireLicenseAcceptance);licenseUrl=$(PackageLicenseUrl);description=$(Description);CodeGenerationRoslynVersion=$(CodeGenerationRoslynVersion);Configuration=$(Configuration);OutDir=$(OutDir)</NuspecProperties>
     </PropertyGroup>
   </Target>
-</Project>
+</Project>

src/ImmutableObjectGraph/ImmutableObjectGraph.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Validation" PrivateAssets="compile" />

src/RoslynDemo/RoslynDemo.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/global.json

@@ -1,8 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.402"
-  },
-  "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.5.4"
+    "version": "2.2.401"
   }
 }