diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9be6f65..c65a573 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 36ddc1b..22ad810 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,6 +13,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/Directory.Build.targets b/Directory.Build.targets
index e586a70..4c2dfd5 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,13 +1,13 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Update="OrchardCore.Application.Cms.Targets" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.ContentManagement" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.ContentTypes.Abstractions" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.DisplayManagement" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.Logging.NLog" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.Module.Targets" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.Navigation.Core" Version="1.1.0" />
-    <PackageReference Update="OrchardCore.ResourceManagement" Version="1.1.0" />
+    <PackageReference Update="OrchardCore.Application.Cms.Targets" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.ContentManagement" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.ContentTypes.Abstractions" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.DisplayManagement" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.Logging.NLog" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.Module.Targets" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.Navigation.Core" Version="1.2.2" />
+    <PackageReference Update="OrchardCore.ResourceManagement" Version="1.2.2" />
   </ItemGroup>
-</Project>  
+</Project>  
\ No newline at end of file
diff --git a/samples/ThisNetWorks.OrchardCore.GoogleMaps.Sample/ThisNetWorks.OrchardCore.GoogleMaps.Sample.csproj b/samples/ThisNetWorks.OrchardCore.GoogleMaps.Sample/ThisNetWorks.OrchardCore.GoogleMaps.Sample.csproj
index b2cbd67..4a70e7c 100644
--- a/samples/ThisNetWorks.OrchardCore.GoogleMaps.Sample/ThisNetWorks.OrchardCore.GoogleMaps.Sample.csproj
+++ b/samples/ThisNetWorks.OrchardCore.GoogleMaps.Sample/ThisNetWorks.OrchardCore.GoogleMaps.Sample.csproj
@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <TieredCompilation>true</TieredCompilation>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <PreserveCompilationReferences>true</PreserveCompilationReferences>
+    <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="Views\QueryGoogleMaps.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="wwwroot\" />
     <Folder Include="Localization\" />
diff --git a/src/Manifest.cs b/src/Manifest.cs
index 4796594..4c24037 100644
--- a/src/Manifest.cs
+++ b/src/Manifest.cs
@@ -4,7 +4,7 @@
     Name = "Google Maps",
     Author = "ThisNetWorks",
     Website = "https://github.com/ThisNetWorks/ThisNetWorks.OrchardCore.GoogleMaps",
-    Version = "1.1.0",
+    Version = "1.2.0",
     Description = "Google Maps Module",
     Dependencies = new[] { "OrchardCore.Contents" },
     Category = "Content Management"
diff --git a/src/ThisNetWorks.OrchardCore.GoogleMaps.csproj b/src/ThisNetWorks.OrchardCore.GoogleMaps.csproj
index e92a797..3975ca2 100644
--- a/src/ThisNetWorks.OrchardCore.GoogleMaps.csproj
+++ b/src/ThisNetWorks.OrchardCore.GoogleMaps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>