From 893f427638f8f72416ff48a66677c10ef0f19f95 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 13 Jul 2021 04:44:37 +0200
Subject: [PATCH 1/5] Build classic solution as well

---
 azure-pipelines.yml                  |  9 ++++++---
 build/Microsoft.Maui.Graphics.nuspec | 10 ++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index da8b050..9f2a6a8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -103,11 +103,14 @@ stages:
             - pwsh: |
                 $vs = & dotnet vs where --preview --prop=InstallationPath
                 $msbuild = "$vs\MSBuild\Current\Bin\MSBuild.exe"
-                & $msbuild /r ./Microsoft.Maui.Graphics-net6.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
+                & $msbuild /r ./Microsoft.Maui.Graphics.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
               displayName: build net6 solutions
 
-            # - pwsh: dotnet cake --configuration=${{ BuildConfiguration }}
-            #   displayName: build net6 solutions
+            - pwsh: |
+                $vs = & dotnet vs where --preview --prop=InstallationPath
+                $msbuild = "$vs\MSBuild\Current\Bin\MSBuild.exe"
+                & $msbuild /r ./Microsoft.Maui.Graphics-net6.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
+              displayName: build net6 solutions
 
             - task: NuGetCommand@2
               displayName: 'Pack nupkg'
diff --git a/build/Microsoft.Maui.Graphics.nuspec b/build/Microsoft.Maui.Graphics.nuspec
index 2a94a2f..c349824 100644
--- a/build/Microsoft.Maui.Graphics.nuspec
+++ b/build/Microsoft.Maui.Graphics.nuspec
@@ -19,6 +19,9 @@
       <group targetFramework="net6.0-ios13.6" />
       <group targetFramework="net6.0-maccatalyst13.5" />
       <group targetFramework="net6.0-windows10.0.18362" />
+      <group targetFramework="xamarin.ios10" />
+      <group targetFramework="monoandroid10.0" />
+      <group targetFramework="xamarin.mac20" />
       <group targetFramework=".NETStandard2.0" />
       <group targetFramework=".NETStandard2.1" />
     </dependencies>
@@ -29,6 +32,13 @@
     <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.dll" target="lib/netstandard2.1/Microsoft.Maui.Graphics.dll"/>
     <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.pdb" target="lib/netstandard2.1/Microsoft.Maui.Graphics.pdb"/>
 
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.dll" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.dll"/>
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.pdb" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.pdb"/>
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.dll" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.dll"/>
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.pdb" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.pdb"/>
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.dll" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.dll"/>
+    <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.pdb" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.pdb"/>
+
     <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.dll" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.dll"/>
     <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.pdb" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.pdb"/>
     <file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-android/Microsoft.Maui.Graphics.dll" target="lib/net6.0-android30.0/Microsoft.Maui.Graphics.dll"/>

From 3acb336608078094e79c882773a510eb9bbd880f Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 13 Jul 2021 04:52:26 +0200
Subject: [PATCH 2/5] -net6

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f2a6a8..92fbd79 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -109,7 +109,7 @@ stages:
             - pwsh: |
                 $vs = & dotnet vs where --preview --prop=InstallationPath
                 $msbuild = "$vs\MSBuild\Current\Bin\MSBuild.exe"
-                & $msbuild /r ./Microsoft.Maui.Graphics-net6.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
+                & $msbuild /r ./Microsoft.Maui.Graphics-net6.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}-net6.binlog
               displayName: build net6 solutions
 
             - task: NuGetCommand@2

From 16e1fef943ad336a3519382803c76becd91f2feb Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 13 Jul 2021 04:55:35 +0200
Subject: [PATCH 3/5] Graphics.Windows

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 92fbd79..10a4d6f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -103,8 +103,8 @@ stages:
             - pwsh: |
                 $vs = & dotnet vs where --preview --prop=InstallationPath
                 $msbuild = "$vs\MSBuild\Current\Bin\MSBuild.exe"
-                & $msbuild /r ./Microsoft.Maui.Graphics.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
-              displayName: build net6 solutions
+                & $msbuild /r ./Microsoft.Maui.Graphics.Windows.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
+              displayName: build classic solutions
 
             - pwsh: |
                 $vs = & dotnet vs where --preview --prop=InstallationPath

From d0f329eb29979150a5bacbd9fb4eb63f057d19ed Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 13 Jul 2021 05:25:52 +0200
Subject: [PATCH 4/5] X(

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 10a4d6f..2e80d61 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -103,7 +103,7 @@ stages:
             - pwsh: |
                 $vs = & dotnet vs where --preview --prop=InstallationPath
                 $msbuild = "$vs\MSBuild\Current\Bin\MSBuild.exe"
-                & $msbuild /r ./Microsoft.Maui.Graphics.Windows.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
+                & $msbuild /r ./build/Build.Microsoft.Maui.Graphics.Windows.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog
               displayName: build classic solutions
 
             - pwsh: |

From ebe01f78ddeb17c830e24f5ba1fb928ebbd89118 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 11:01:21 +0000
Subject: [PATCH 5/5] Update dependencies from
 https://github.com/xamarin/xamarin-android build
 6.0.1xx-preview6-9a7da6d3e943544abbf67758b50fd5afb21875cc-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.5.28 -> To Version 30.0.100-preview.6.62

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.5.21302.13 -> To Version 6.0.100-preview.6.21355.2 (parent: Microsoft.Android.Sdk.Windows
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b49ea92..0c97c91 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,12 +1,12 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21302.13" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21355.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>d6380bcae783600a01a9c8a6a151bb6a66c777b0</Sha>
+      <Sha>7f8e0d76c0862f3afab687505b4177d52b42808f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.5.28">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.6.62">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>5d6745e112c7c7605b64a82fed778cdead99bc85</Sha>
+      <Sha>9a7da6d3e943544abbf67758b50fd5afb21875cc</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.5.100-preview.5.884">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index b22828d..08d0f3d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,8 +1,8 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21302.13</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.5.28</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21355.2</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.6.62</MicrosoftAndroidSdkWindowsPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>14.5.100-preview.5.884</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftiOSSdkPackageVersion>14.5.100-preview.5.884</MicrosoftiOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>14.5.100-preview.5.884</MicrosofttvOSSdkPackageVersion>