Merge branch 'main' into darc-main-fc493bca-c7bd-42a5-abe9-f959abb23474

This commit is contained in:
Jonathan Dick 2021-07-16 15:54:33 -04:00 коммит произвёл GitHub
Родитель a187cf24dc bc1240455b
Коммит 07102fee8c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
13 изменённых файлов: 113 добавлений и 43 удалений

Просмотреть файл

@ -19,6 +19,12 @@
"commands": [
"vs"
]
},
"boots": {
"version": "1.0.4.624",
"commands": [
"boots"
]
}
}
}
}

Просмотреть файл

@ -1 +1 @@
6.0.100-preview.6
6.0.100-preview.7

Просмотреть файл

@ -5,6 +5,7 @@ variables:
DotNet.Cli.Telemetry.OptOut: true
MauiCheck.Version: 0.6.1
Maui.Version: --preview
Tizen.Version: 6.5.100-preview.5.57
parameters:
- name: BuildConfigurations
@ -85,6 +86,10 @@ stages:
- pwsh: dotnet tool restore
displayName: install dotnet tools
- pwsh:
dotnet boots --url https://workload-bin.s3.ap-northeast-2.amazonaws.com/windows/Samsung.NET.Workload.Tizen.$(Tizen.Version).msi
displayName: install tizen
- pwsh: |
# Update the installer installer
Invoke-WebRequest -UseBasicParsing -Uri "https://aka.ms/vs/install/latest/vs_setup.exe" -OutFile vs_setup.exe

Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30523.141
# Visual Studio Version 17
VisualStudioVersion = 17.0.31509.46
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics", "..\src\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics.csproj", "{76F3031E-341E-43CC-BD92-B23F83495DB7}"
EndProject
@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Maui.Graphics.Win
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop", "..\src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.csproj", "{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia", "..\src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia.csproj", "{6738582B-6246-486B-B90E-6C80799736B5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -91,6 +93,22 @@ Global
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x64.Build.0 = Release|Any CPU
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.ActiveCfg = Release|Any CPU
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.Build.0 = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -100,6 +118,7 @@ Global
{ED36FB6D-7278-465D-9C44-D01927258BA1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{20794E60-3BFD-46F4-BC0B-87B3959AA3C7} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}

Просмотреть файл

@ -35,6 +35,31 @@
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views.WinUI" version="2.88.0-preview.61"/>
</group>
<group targetFramework="net6.0-tizen">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.61"/>
</group>
<group targetFramework="tizen40">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.61"/>
</group>
<group targetFramework="xamarin.ios10">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.61"/>
</group>
<group targetFramework="monoandroid10.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.61"/>
</group>
<group targetFramework="xamarin.mac20">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.61"/>
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.61"/>
@ -59,5 +84,18 @@
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-tizen/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-tizen/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-tizen/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-tizen/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.dll" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.dll"/>
<file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.pdb" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.pdb"/>
</files>
</package>
</package>

Просмотреть файл

@ -19,6 +19,8 @@
<group targetFramework="net6.0-ios13.6" />
<group targetFramework="net6.0-maccatalyst13.5" />
<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" />
@ -47,5 +49,9 @@
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.pdb" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.pdb"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.dll"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.pdb"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-tizen/Microsoft.Maui.Graphics.dll" target="lib/net6.0-tizen/Microsoft.Maui.Graphics.dll"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/net6.0-tizen/Microsoft.Maui.Graphics.pdb" target="lib/net6.0-tizen/Microsoft.Maui.Graphics.pdb"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.dll" target="lib/tizen40/Microsoft.Maui.Graphics.dll"/>
<file src="src/Microsoft.Maui.Graphics/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.pdb" target="lib/tizen40/Microsoft.Maui.Graphics.pdb"/>
</files>
</package>

Просмотреть файл

@ -8,21 +8,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>7dacdd751dd0bd7b02ac443c32824f353a6da380</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-preview.6.64">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-ci.main.167">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>f60eec00877fe65010edf4332f7818621f02f9d0</Sha>
<Sha>dacf37413964f1be586e253bfd2e4b5d4051dab1</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="15.0.100-preview.6.64">
<Dependency Name="Microsoft.iOS.Sdk" Version="15.0.100-ci.main.167">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>f60eec00877fe65010edf4332f7818621f02f9d0</Sha>
<Sha>dacf37413964f1be586e253bfd2e4b5d4051dab1</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.0.100-preview.6.64">
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.0.100-ci.main.167">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>f60eec00877fe65010edf4332f7818621f02f9d0</Sha>
<Sha>dacf37413964f1be586e253bfd2e4b5d4051dab1</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.0.100-preview.6.64">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.0.100-ci.main.167">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>f60eec00877fe65010edf4332f7818621f02f9d0</Sha>
<Sha>dacf37413964f1be586e253bfd2e4b5d4051dab1</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>

Просмотреть файл

@ -3,10 +3,10 @@
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-ci.main.83</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-preview.6.64</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-preview.6.64</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-preview.6.64</MicrosofttvOSSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.0.100-preview.6.64</MicrosoftmacOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-ci.main.167</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-ci.main.167</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-ci.main.167</MicrosofttvOSSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.0.100-ci.main.167</MicrosoftmacOSSdkPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362;net6.0-tizen</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
<AssemblyName>Microsoft.Maui.Graphics.Skia</AssemblyName>
</PropertyGroup>
@ -10,7 +10,7 @@
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.61" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) or $(TargetFramework.Contains('-ios')) or $(TargetFramework.Contains('-maccatalyst'))">
<ItemGroup Condition="$(TargetFramework.Contains('-android')) or $(TargetFramework.Contains('-ios')) or $(TargetFramework.Contains('-maccatalyst')) or $(TargetFramework.Contains('-tizen'))">
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.61" />
</ItemGroup>

Просмотреть файл

@ -1,27 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
<Version>2.0.0</Version>
</PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;tizen40</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Views\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.Views" Version="2.80.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.Views" Version="2.80.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'Xamarin.Mac20' Or '$(TargetFramework)' == 'netstandard2.1'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'Xamarin.Mac20' Or '$(TargetFramework)' == 'netstandard2.1'">
<Reference Include="netstandard" />
</ItemGroup>
<Import Project="..\targets\MultiTargeting.targets" />
<Import Project="..\targets\MultiTargeting.targets" />
</Project>

Просмотреть файл

@ -1,6 +1,6 @@
using System;
using Microsoft.Maui.Graphics.CoreGraphics;
using Microsoft.Maui.Graphics.Native;
using Microsoft.Maui.Graphics.Skia;
using SkiaSharp.Views.Mac;

Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362;net6.0-tizen</TargetFrameworks>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->

Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;tizen40</TargetFrameworks>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
@ -27,4 +27,4 @@
</Compile>
</ItemGroup>
<Import Project="..\targets\MultiTargeting.targets" />
</Project>
</Project>