diff --git a/azure-pipelines.yml b/azure-pipelines.yml index da8b050..2e80d61 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 - displayName: build net6 solutions + & $msbuild /r ./build/Build.Microsoft.Maui.Graphics.Windows.sln /p:Configuration=${{ BuildConfiguration }} /bl:$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}.binlog + displayName: build classic 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 }}-net6.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 2648adb..3055d8d 100644 --- a/build/Microsoft.Maui.Graphics.nuspec +++ b/build/Microsoft.Maui.Graphics.nuspec @@ -21,6 +21,9 @@ + + + @@ -31,6 +34,13 @@ + + + + + + + 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 @@ - + https://github.com/dotnet/installer - d6380bcae783600a01a9c8a6a151bb6a66c777b0 + 7f8e0d76c0862f3afab687505b4177d52b42808f - + https://github.com/xamarin/xamarin-android - 5d6745e112c7c7605b64a82fed778cdead99bc85 + 9a7da6d3e943544abbf67758b50fd5afb21875cc https://github.com/xamarin/xamarin-macios 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 @@ - 6.0.100-preview.5.21302.13 - 30.0.100-preview.5.28 + 6.0.100-preview.6.21355.2 + 30.0.100-preview.6.62 14.5.100-preview.5.884 14.5.100-preview.5.884 14.5.100-preview.5.884