diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f5768a1..9499ad7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,21 +25,23 @@ jobs:
     - task: NuGetCommand@2
       displayName: 'Nuget restore solution'
       inputs:
-        restoreSolution: '**/*.sln'
+        restoreSolution: '**/CalendarPlugin.csproj'
 
     - task: MSBuild@1
       inputs:
         solution: '**/CalendarPlugin.csproj'
+        msbuildArguments: '/p:Version=$(nugetVersion)'
         configuration: '$(BuildConfiguration)'
-        msbuildArguments: '/p:Version=$(nugetVersion) /p:OutputPath=$(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration)/'
 
     - task: PublishBuildArtifacts@1
       displayName: 'Publish Artifact: nupkg'
       inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration)'
+        PathtoPublish: 'src\Calendar.Plugin\bin\Release\'
         ArtifactName: nupkg
 
 - job: 'iOSSampleApp'
+  dependsOn:
+    - Nuget
   pool:
     vmImage: 'macOS-latest'
   steps:
@@ -49,16 +51,41 @@ jobs:
       inputs:
         version: 3.x
 
-    - script: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 6_4_0
+    - script: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 6_6_0
       displayName: 'Selecting the Xamarin SDK version'
 
-    - task: NuGetCommand@2
-      displayName: 'Nuget restore solution'
+    - task: DownloadBuildArtifacts@0
+      displayName: "Download PackNugetPackage artifacts"
       inputs:
-        restoreSolution: '**/*.sln'
+        buildType: 'current'
+        downloadType: 'single'
+        downloadPath: '$(build.binariesDirectory)/nuget/'
+        artifactName: 'nupkg'
+
+    - task: Bash@3
+      inputs:
+        targetType: 'inline'
+        script: |
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj"/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'"/g' src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj
+
+          sed -i .bak -e '/81e938f4-a11c-4726-a13f-0d7ecc84ca66/d' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj 
+          sed -i .bak -e '/<Name>CalendarPlugin/d' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj 
+          sed -E -i .bak -e '/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/{N;s/\n.*//;}' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'" \/>/g' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+
+          sed -i .bak -e '/81e938f4-a11c-4726-a13f-0d7ecc84ca66/d' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -i .bak -e '/<Name>CalendarPlugin/d' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -E -i .bak -e '/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/{N;s/\n.*//;}' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'" \/>/g' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+        
+          cat src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+          cat src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj 
+
+          nuget restore src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj -NonInteractive -Source $(build.binariesDirectory)/nuget/nupkg/ -Source https://api.nuget.org/v3/index.json
+          nuget restore src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj -NonInteractive -Source $(build.binariesDirectory)/nuget/nupkg/ -Source https://api.nuget.org/v3/index.json
 
     - task: XamariniOS@2
-      continueOnError: true      
+      continueOnError: true
       inputs:
         solutionFile: '**/SampleApp.iOS.csproj'
         configuration: '$(buildConfiguration)'
@@ -67,8 +94,10 @@ jobs:
         buildForSimulator: true
 
 - job: 'AndroidSampleApp'
+  dependsOn:
+    - Nuget
   pool:
-    vmImage: 'windows-latest'
+    vmImage: 'macOS-latest'
   steps:
     - task: NuGetToolInstaller@1
     - task: UseDotNet@2
@@ -76,10 +105,39 @@ jobs:
       inputs:
         version: 3.x
 
-    - task: NuGetCommand@2
-      displayName: 'Nuget restore solution'
+    - script: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 6_6_0
+      displayName: 'Selecting the Xamarin SDK version'
+
+    - task: DownloadBuildArtifacts@0
+      displayName: "Download PackNugetPackage artifacts"
       inputs:
-        restoreSolution: '**/*.sln'
+        buildType: 'current'
+        downloadType: 'single'
+        downloadPath: '$(build.binariesDirectory)/nuget/'
+        artifactName: 'nupkg'
+
+    - task: Bash@3
+      inputs:
+        targetType: 'inline'
+        script: |
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj"/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'"/g' src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj
+
+          sed -i .bak -e '/81e938f4-a11c-4726-a13f-0d7ecc84ca66/d' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj 
+          sed -i .bak -e '/<Name>CalendarPlugin/d' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj 
+          sed -E -i .bak -e '/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/{N;s/\n.*//;}' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'" \/>/g' src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+
+          sed -i .bak -e '/81e938f4-a11c-4726-a13f-0d7ecc84ca66/d' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -i .bak -e '/<Name>CalendarPlugin/d' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -E -i .bak -e '/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/{N;s/\n.*//;}' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+          sed -E -i .bak -e 's/<ProjectReference Include="..\\..\\Calendar.Plugin\\CalendarPlugin.csproj">/<PackageReference Include="Xamarin.Plugin.Calendar" Version="'$(nugetVersion)'" \/>/g' src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+            
+          cat src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+          cat src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj          
+          
+          nuget restore src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj -NonInteractive -Source $(build.binariesDirectory)/nuget/nupkg/ -Source https://api.nuget.org/v3/index.json
+          nuget restore src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj -NonInteractive -Source $(build.binariesDirectory)/nuget/nupkg/ -Source https://api.nuget.org/v3/index.json
+
     - task: XamarinAndroid@1
       displayName: 'Build Xamarin.Android project SampleApp.Android.csproj'
       inputs:
@@ -87,7 +145,7 @@ jobs:
         createAppPackage: true
         outputDirectory: '$(build.binariesdirectory)/$(BuildConfiguration)'
         jdkOption: 'JDKVersion'
-        clean: true
+        clean: false
         configuration: '$(BuildConfiguration)'
         msbuildVersionOption: latest
 
diff --git a/src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj b/src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
index 4abeb8f..8a9c729 100644
--- a/src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
+++ b/src/Calendar.Plugin.Sample/SampleApp.Android/SampleApp.Android.csproj
@@ -52,7 +52,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
@@ -96,15 +96,19 @@
     <Folder Include="Resources\drawable-xxxhdpi\" />
     <Folder Include="Resources\drawable\" />
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  
   <ItemGroup>
     <ProjectReference Include="..\..\Calendar.Plugin\CalendarPlugin.csproj">
-      <Project>{81e938f4-a11c-4726-a13f-0d7ecc84ca66}</Project>
+     <Project>{81e938f4-a11c-4726-a13f-0d7ecc84ca66}</Project>	
       <Name>CalendarPlugin</Name>
     </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\SampleApp\SampleApp.csproj">
       <Project>{E4FB5119-AAD4-43E4-8741-1759FAF4083B}</Project>
       <Name>SampleApp</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj b/src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
index 0d30f6c..3dbb90f 100644
--- a/src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
+++ b/src/Calendar.Plugin.Sample/SampleApp.iOS/SampleApp.iOS.csproj
@@ -124,17 +124,21 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+
   <ItemGroup>
     <ProjectReference Include="..\..\Calendar.Plugin\CalendarPlugin.csproj">
       <Project>{81e938f4-a11c-4726-a13f-0d7ecc84ca66}</Project>
       <Name>CalendarPlugin</Name>
     </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\SampleApp\SampleApp.csproj">
       <Project>{E4FB5119-AAD4-43E4-8741-1759FAF4083B}</Project>
       <Name>SampleApp</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj b/src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj
index 25c8824..9afddcf 100644
--- a/src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj
+++ b/src/Calendar.Plugin.Sample/SampleApp/SampleApp.csproj
@@ -16,10 +16,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Calendar.Plugin\CalendarPlugin.csproj" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Calendar.Plugin/CalendarPlugin.csproj b/src/Calendar.Plugin/CalendarPlugin.csproj
index a230921..14c1929 100644
--- a/src/Calendar.Plugin/CalendarPlugin.csproj
+++ b/src/Calendar.Plugin/CalendarPlugin.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
-
+  
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;MonoAndroid81;Xamarin.iOS10</TargetFrameworks>
     <Authors>Josip Caleta</Authors>
@@ -48,7 +48,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.2.0.839982" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
     <Compile Include="Shared\**\*.cs" />
   </ItemGroup>
 
@@ -100,5 +100,5 @@
     <Compile Include="iOS\*.cs" />
   </ItemGroup>
 
-
+  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>