VS2017

Build.ps1

@@ -1 +1 @@
-iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/452c01f4b81a6c914f2cb8adbc19558e7403a7ff/Build.ps1'))
+iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/f27313f986ce2b26b091b87649771b0bcee0c30c/Build.ps1'))

Coverage.ps1

@@ -1,3 +1,3 @@
 $testProjectLocations = @('test/UnitTests')
 $outputLocation = 'testResults'
-iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/599beba35b53f495d4df6e5c323573aa839137a3/Coverage.ps1'))
+iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/f27313f986ce2b26b091b87649771b0bcee0c30c/Coverage.ps1'))

Nito.Cancellation.sln

@@ -1,24 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{190A6DF0-09D2-4E25-AFED-5B7143441E45}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FA49D3F7-E2E4-41EC-A1D5-3C3140FC917A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Cancellation", "src\Nito.Cancellation\Nito.Cancellation.xproj", "{D7AB5ED8-1B5B-468B-A3BA-8D15DC81EEAC}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.xproj", "{69835B82-BC52-4A97-AA51-276EE69DBAC9}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2763A84F-E2CF-4E07-B0B2-0C413D35D2E7}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		Coverage.ps1 = Coverage.ps1
-		global.json = global.json
+		Version.ps1 = Version.ps1
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nito.Cancellation", "src\Nito.Cancellation\Nito.Cancellation.csproj", "{D7AB5ED8-1B5B-468B-A3BA-8D15DC81EEAC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{69835B82-BC52-4A97-AA51-276EE69DBAC9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Version.ps1

@@ -0,0 +1,2 @@
+param([String]$oldVersion="", [String]$newVersion="")
+iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/f27313f986ce2b26b091b87649771b0bcee0c30c/Version.ps1'))

appveyor.yml

@@ -1,22 +1,12 @@
 version: '{build}'
-os: Visual Studio 2015
+os: Visual Studio 2017
 configuration: Debug
 environment:
   COVERALLS_REPO_TOKEN:
     secure: Ses9s35cBORTLlaH39vkyozMS8BeFCXbwHw5C+mMwWCTT5AS/2Y45lu3Cw0kPxed
 branches:
   only:
     - master
-install:
-- ps: >-
-    nuget update -self
-
-    Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\dotnet-install.ps1"
-
-    $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-
-    & .\dotnet-install.ps1 -Channel "preview" -Version "1.0.0-preview2-003121" -InstallDir "$env:DOTNET_INSTALL_DIR"
-
 build_script:
 - ps: ./Build.ps1
 test_script:

src/Nito.Cancellation/Nito.Cancellation.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Helper types for working with cancellation tokens and sources.</Description>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <Authors>Stephen Cleary</Authors>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Nito.Cancellation</AssemblyName>
+    <PackageId>Nito.Cancellation</PackageId>
+    <PackageTags>cancellation;cancellationtoken</PackageTags>
+    <PackageProjectUrl>https://github.com/StephenCleary/Cancellation</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/StephenCleary/Cancellation/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/StephenCleary/Cancellation.git</RepositoryUrl>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.0|AnyCPU'">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nito.Disposables" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>

test/UnitTests/UnitTests.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <AssemblyName>UnitTests</AssemblyName>
+    <PackageId>UnitTests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Nito.Cancellation\Nito.Cancellation.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
+    <PackageReference Include="ReportGenerator" Version="2.4.4" />
+    <PackageReference Include="coveralls.io" Version="1.3.4" />
+    <PackageReference Include="OpenCover" Version="4.6.519" />
+  </ItemGroup>
+
+</Project>