dotnet
/
System.Graphics
зеркало из https://github.com/dotnet/Microsoft.Maui.Graphics.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'main' into pr/116

This commit is contained in:
Matthew Leibowitz 2021-07-13 17:32:57 +02:00
Родитель df6055f133 857a0653cb
Коммит 8891b5ccb0
4 изменённых файлов: 23 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
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'

10
build/Microsoft.Maui.Graphics.nuspec
Просмотреть файл

@ -21,6 +21,9 @@
<group targetFramework="net6.0-windows10.0.18362" />
<group targetFramework="net6.0-tizen" />
<group targetFramework="tizen40" />
<group targetFramework="xamarin.ios10" />
<group targetFramework="monoandroid10.0" />
<group targetFramework="xamarin.mac20" />
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETStandard2.1" />
</dependencies>
@ -31,6 +34,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"/>

8
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>

4
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>