diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 593dd95..f80eebf 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -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
 
diff --git a/nuspec/Cake.IIS.nuspec b/nuspec/Cake.IIS.nuspec
index 3703196..c57908f 100644
--- a/nuspec/Cake.IIS.nuspec
+++ b/nuspec/Cake.IIS.nuspec
@@ -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>
diff --git a/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj b/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj
index fd4dee2..057f64e 100644
--- a/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj
+++ b/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj
@@ -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>
@@ -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>
diff --git a/src/Cake.IIS.Tests/Test/Iron/web.config b/src/Cake.IIS.Tests/Test/Iron/web.config
index bbb529c..16ed325 100644
--- a/src/Cake.IIS.Tests/Test/Iron/web.config
+++ b/src/Cake.IIS.Tests/Test/Iron/web.config
@@ -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>
\ No newline at end of file
diff --git a/src/Cake.IIS.Tests/Test/Man/web.config b/src/Cake.IIS.Tests/Test/Man/web.config
index bbb529c..6c93c7e 100644
--- a/src/Cake.IIS.Tests/Test/Man/web.config
+++ b/src/Cake.IIS.Tests/Test/Man/web.config
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <system.webServer>
+        <directoryBrowse enabled="false" showFlags="None" />
+    </system.webServer>
 </configuration>
\ No newline at end of file
diff --git a/src/Cake.IIS.Tests/Test/Stark/web.config b/src/Cake.IIS.Tests/Test/Stark/web.config
index bbb529c..6c93c7e 100644
--- a/src/Cake.IIS.Tests/Test/Stark/web.config
+++ b/src/Cake.IIS.Tests/Test/Stark/web.config
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <system.webServer>
+        <directoryBrowse enabled="false" showFlags="None" />
+    </system.webServer>
 </configuration>
\ No newline at end of file
diff --git a/src/Cake.IIS.Tests/Test/Tony/web.config b/src/Cake.IIS.Tests/Test/Tony/web.config
index bbb529c..16ed325 100644
--- a/src/Cake.IIS.Tests/Test/Tony/web.config
+++ b/src/Cake.IIS.Tests/Test/Tony/web.config
@@ -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>
\ No newline at end of file
diff --git a/src/Cake.IIS.Tests/Utils/CakeHelper.cs b/src/Cake.IIS.Tests/Utils/CakeHelper.cs
index 1375e0f..ec40f4b 100644
--- a/src/Cake.IIS.Tests/Utils/CakeHelper.cs
+++ b/src/Cake.IIS.Tests/Utils/CakeHelper.cs
@@ -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;
 
diff --git a/src/Cake.IIS/Cake.IIS.csproj b/src/Cake.IIS/Cake.IIS.csproj
index 5a8ea4b..291a1c7 100644
--- a/src/Cake.IIS/Cake.IIS.csproj
+++ b/src/Cake.IIS/Cake.IIS.csproj
@@ -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>
 
@@ -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>
diff --git a/src/Cake.IIS/cake-contrib-addin-small.png b/src/Cake.IIS/cake-contrib-addin-small.png
new file mode 100644
index 0000000..fb97eed
Binary files /dev/null and b/src/Cake.IIS/cake-contrib-addin-small.png differ