update to .net 4.6.2, cake 0.22, bump version to 0.3.3

cake-contrib · Sep 13, 2017 · 651e31d · 651e31d
1 parent 662bbde
commit 651e31d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 28 deletions.
diff --git a/src/Cake.Yarn.Tests/Cake.Yarn.Tests.csproj b/src/Cake.Yarn.Tests/Cake.Yarn.Tests.csproj
@@ -9,9 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Cake.Yarn.Tests</RootNamespace>
     <AssemblyName>Cake.Yarn.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,11 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Cake.Core.0.21.1\lib\net45\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Cake.Core.0.22.0\lib\net46\Cake.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Cake.Testing, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Cake.Testing.0.21.1\lib\net45\Cake.Testing.dll</HintPath>
+    <Reference Include="Cake.Testing, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Cake.Testing.0.22.0\lib\net46\Cake.Testing.dll</HintPath>
     </Reference>
     <Reference Include="Shouldly, Version=2.8.3.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Shouldly.2.8.3\lib\net40\Shouldly.dll</HintPath>
@@ -95,6 +97,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Cake.Yarn.Tests/packages.config b/src/Cake.Yarn.Tests/packages.config
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Cake.Core" version="0.21.1" targetFramework="net45" />
-  <package id="Cake.Testing" version="0.21.1" targetFramework="net45" />
-  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
-  <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
-  <package id="Shouldly" version="2.8.3" targetFramework="net45" />
+  <package id="Cake.Core" version="0.22.0" targetFramework="net462" />
+  <package id="Cake.Testing" version="0.22.0" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="2.0.0" targetFramework="net462" />
+  <package id="NETStandard.Library" version="2.0.0" targetFramework="net462" />
+  <package id="Shouldly" version="2.8.3" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Globalization" version="4.3.0" targetFramework="net45" />
-  <package id="System.IO" version="4.3.0" targetFramework="net45" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
+  <package id="System.IO" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Linq" version="4.3.0" targetFramework="net45" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.3.2" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.2" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net45" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
   <package id="System.Threading" version="4.3.0" targetFramework="net45" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
   <package id="xunit" version="2.2.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net45" />
   <package id="xunit.assert" version="2.2.0" targetFramework="net45" />
   <package id="xunit.core" version="2.2.0" targetFramework="net45" />
   <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net45" requireReinstallation="true" />
 </packages>
diff --git a/src/Cake.Yarn/Cake.Yarn.csproj b/src/Cake.Yarn/Cake.Yarn.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Cake.Yarn</RootNamespace>
     <AssemblyName>Cake.Yarn</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -33,8 +33,8 @@
     <DocumentationFile>bin\Release\Cake.Yarn.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Cake.Core.0.21.1\lib\net45\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Cake.Core.0.22.0\lib\net46\Cake.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Cake.Yarn/Cake.Yarn.nuspec b/src/Cake.Yarn/Cake.Yarn.nuspec
@@ -11,7 +11,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A set of aliases for Cake to help with running Yarn (node package manager from Facebook) commands</description>
     <tags>Cake Script Build Yarn</tags>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
   </metadata>
   <files>
     <file src="..\..\artifacts\build\Cake.Yarn.xml" target="lib\net45" />

diff --git a/src/Cake.Yarn/Properties/AssemblyInfo.cs b/src/Cake.Yarn/Properties/AssemblyInfo.cs
@@ -14,6 +14,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: InternalsVisibleTo("Cake.Yarn.Tests")]
-[assembly: AssemblyVersion("0.3.2")]
-[assembly: AssemblyFileVersion("0.3.2")]
-[assembly: AssemblyInformationalVersion("0.3.2")]
+[assembly: AssemblyVersion("0.3.3")]
+[assembly: AssemblyFileVersion("0.3.3")]
+[assembly: AssemblyInformationalVersion("0.3.3")]
diff --git a/src/Cake.Yarn/packages.config b/src/Cake.Yarn/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Cake.Core" version="0.21.1" targetFramework="net45" />
+  <package id="Cake.Core" version="0.22.0" targetFramework="net462" />
 </packages>