Skip to content

Upgrade to cake 2 #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdaskoTheBeAsT wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to cake 2 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### New in 2.0.0
* [Improvement] Update to Cake.Core v2.0.0

### New in 1.0.0 (Released 2021/04/25)
* [Improvement] Update to Cake.Core v1.0.0

Expand Down
18 changes: 9 additions & 9 deletions nuspec/Cake.IIS.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
</metadata>

<files>
<file src="net461/Cake.IIS.dll" target="lib/net461" />
<file src="net461/Cake.IIS.xml" target="lib/net461" />
<file src="net461/Cake.IIS.pdb" target="lib/net461" />
<file src="net461/Microsoft.Web.Administration.dll" target="lib/net461" />

<file src="netstandard2.0/Cake.IIS.dll" target="lib/netstandard2.0" />
<file src="netstandard2.0/Cake.IIS.xml" target="lib/netstandard2.0" />
<file src="netstandard2.0/Cake.IIS.pdb" target="lib/netstandard2.0" />
<file src="netstandard2.0/Cake.IIS.deps.json" target="lib/netstandard2.0" />
<file src="netcoreapp3.1/Cake.IIS.dll" target="lib/netcoreapp3.1" />
<file src="netcoreapp3.1/Cake.IIS.xml" target="lib/netcoreapp3.1" />
<file src="netcoreapp3.1/Cake.IIS.pdb" target="lib/netcoreapp3.1" />
<file src="netcoreapp3.1/Cake.IIS.deps.json" target="netcoreapp3.1" />

<file src="net5.0/Cake.IIS.dll" target="lib/net5.0" />
<file src="net5.0/Cake.IIS.xml" target="lib/net5.0" />
<file src="net5.0/Cake.IIS.pdb" target="lib/net5.0" />
<file src="net5.0/Cake.IIS.deps.json" target="lib/net5.0" />

<file src="net6.0/Cake.IIS.dll" target="lib/net6.0" />
<file src="net6.0/Cake.IIS.xml" target="lib/net6.0" />
<file src="net6.0/Cake.IIS.pdb" target="lib/net6.0" />
<file src="net6.0/Cake.IIS.deps.json" target="lib/net6.0" />

<file src="LICENSE" />
</files>
Expand Down
18 changes: 9 additions & 9 deletions src/Cake.IIS.Tests/Cake.IIS.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageId>Cake.IIS.Tests</PackageId>
<OutputType>Library</OutputType>

<TargetFrameworks>net461;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>

<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
Expand All @@ -19,21 +19,21 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />

<PackageReference Include="Cake.Core" Version="1.0.0" />
<PackageReference Include="Cake.Testing" Version="1.0.0" />
<PackageReference Include="Cake.Core" Version="2.0.0" />
<PackageReference Include="Cake.Testing" Version="2.0.0" />

<PackageReference Include="Microsoft.Web.Administration" Version="11.1.0" />

<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.66" />
<PackageReference Include="NSubstitute" Version="4.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions src/Cake.IIS.Tests/Test/Iron/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<directoryBrowse enabled="true" showFlags="Date, Time, Size, Extension" />
</system.webServer>
</configuration>
3 changes: 3 additions & 0 deletions src/Cake.IIS.Tests/Test/Man/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<directoryBrowse enabled="false" showFlags="None" />
</system.webServer>
</configuration>
3 changes: 3 additions & 0 deletions src/Cake.IIS.Tests/Test/Stark/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<directoryBrowse enabled="false" showFlags="None" />
</system.webServer>
</configuration>
3 changes: 3 additions & 0 deletions src/Cake.IIS.Tests/Test/Tony/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<directoryBrowse enabled="true" showFlags="Date, Time, Size, Extension" />
</system.webServer>
</configuration>
6 changes: 3 additions & 3 deletions src/Cake.IIS.Tests/Utils/CakeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,12 @@ public static ConfigurationElement GetWebFarm(string name)

public static void CreateWebConfig(IDirectorySettings settings)
{
#if NET461
var framework = "net461";
#elif NETCOREAPP3_1
#if NETCOREAPP3_1
var framework = "netcoreapp3.1";
#elif NET5_0
var framework = "net5.0";
#elif NET6_0
var framework = "net6.0";
#endif
var folder = Directory.GetCurrentDirectory().Replace("\\", "/").Replace($"/bin/Debug/{framework}", "/") + settings.PhysicalDirectory.FullPath;

Expand Down
10 changes: 7 additions & 3 deletions src/Cake.IIS/Cake.IIS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<AssemblyName>Cake.IIS</AssemblyName>
<PackageId>Cake.IIS</PackageId>
<OutputType>Library</OutputType>

<TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
<PackageIcon>cake-contrib-addin-small.png</PackageIcon>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>

<GenerateDocumentationFile>true</GenerateDocumentationFile>

Expand All @@ -19,7 +19,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Web.Administration" Version="11.1.0" />
</ItemGroup>

<ItemGroup>
<None Include="cake-contrib-addin-small.png" Pack="true" PackagePath="" />
</ItemGroup>
</Project>
Binary file added src/Cake.IIS/cake-contrib-addin-small.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.