Skip to content

Commit

Permalink
Merge pull request #5 from kcamp/GH-4
Browse files Browse the repository at this point in the history 
GH4: Update to .NET 4.6.1, Update Cake to 0.23
  • Loading branch information
@gep13
gep13 committed Nov 2, 2017
2 parents ad295cc + 50d7016 commit f3fa0f1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 28 deletions.
6 changes: 3 additions & 3 deletions nuspec/nuget/Cake.Grunt.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<tags>Cake, Script, Build, Grunt, Addin</tags>
</metadata>
<files>
<file src="Cake.Grunt.dll" target="lib\net45" />
<file src="Cake.Grunt.pdb" target="lib\net45" />
<file src="Cake.Grunt.xml" target="lib\net45" />
<file src="Cake.Grunt.dll" target="lib\net461" />
<file src="Cake.Grunt.pdb" target="lib\net461" />
<file src="Cake.Grunt.xml" target="lib\net461" />
</files>
</package>
18 changes: 6 additions & 12 deletions src/Cake.Grunt.Tests/Cake.Grunt.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cake.Grunt.Tests</RootNamespace>
<AssemblyName>Cake.Grunt.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
Expand All @@ -34,17 +34,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.Core, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.18.0\lib\net45\Cake.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="Cake.Core, Version=0.23.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.23.0\lib\net46\Cake.Core.dll</HintPath>
</Reference>
<Reference Include="Cake.Testing, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Testing.0.18.0\lib\net45\Cake.Testing.dll</HintPath>
<Private>True</Private>
<Reference Include="Cake.Testing, Version=0.23.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Testing.0.23.0\lib\net46\Cake.Testing.dll</HintPath>
</Reference>
<Reference Include="Shouldly, Version=2.8.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
<HintPath>..\packages\Shouldly.2.8.2\lib\net40\Shouldly.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Shouldly.2.8.2\lib\net451\Shouldly.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -56,15 +53,12 @@
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Cake.Grunt.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
</configuration>
16 changes: 8 additions & 8 deletions src/Cake.Grunt.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Core" version="0.18.0" targetFramework="net45" />
<package id="Cake.Testing" version="0.18.0" targetFramework="net45" />
<package id="Shouldly" version="2.8.2" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
<package id="Cake.Core" version="0.23.0" targetFramework="net461" />
<package id="Cake.Testing" version="0.23.0" targetFramework="net461" />
<package id="Shouldly" version="2.8.2" targetFramework="net461" />
<package id="xunit" version="2.0.0" targetFramework="net461" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
<package id="xunit.assert" version="2.0.0" targetFramework="net461" />
<package id="xunit.core" version="2.0.0" targetFramework="net461" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net461" />
</packages>
7 changes: 3 additions & 4 deletions src/Cake.Grunt/Cake.Grunt.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cake.Grunt</RootNamespace>
<AssemblyName>Cake.Grunt</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -34,9 +34,8 @@
<DocumentationFile>Cake.Grunt.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.Core, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.18.0\lib\net45\Cake.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="Cake.Core, Version=0.23.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.23.0\lib\net46\Cake.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Grunt/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Core" version="0.18.0" targetFramework="net45" />
<package id="Cake.Core" version="0.23.0" targetFramework="net461" />
</packages>

0 comments on commit f3fa0f1

Please sign in to comment.