Update all the things (#1842)
This commit is contained in:
Matthew Leibowitz
GitHub
Родитель
95c296bd9e
Коммит
85613e728c
11
VERSIONS.txt
11
VERSIONS.txt
|
|
@ -22,13 +22,10 @@ System.IO.UnmanagedMemoryStream release 4.3.0
|
|||
System.Drawing.Common release 4.5.1
|
||||
SharpVk release 0.4.2
|
||||
Uno.UI release 3.7.6
|
||||
Microsoft.WindowsAppSDK release 1.0.0-experimental1
|
||||
Microsoft.WindowsAppSDK.Foundation release 1.0.0-experimental1
|
||||
Microsoft.WindowsAppSDK.WinUI release 1.0.0-experimental1
|
||||
Microsoft.WindowsAppSDK.InteractiveExperiences release 1.0.0-experimental1
|
||||
Microsoft.Maui.Graphics release 6.0.100-rc.1.413
|
||||
Microsoft.Windows.SDK.NET.Ref release 10.0.18362.15
|
||||
Microsoft.AspNetCore.Components.Web release 6.0.0-rc.1.21452.15
|
||||
Microsoft.WindowsAppSDK release 1.0.0-preview3
|
||||
Microsoft.Maui.Graphics release 6.0.101-preview.9.512
|
||||
Microsoft.Windows.SDK.NET.Ref release 10.0.18362.18
|
||||
Microsoft.AspNetCore.Components.Web release 6.0.0
|
||||
|
||||
# additional references used by the tooling
|
||||
OpenTK.GLControl reference 1.1.2349.61993
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ namespace SkiaSharp
|
|||
public void PurgeUnlockedResources (long bytesToPurge, bool preferScratchResources) =>
|
||||
SkiaApi.gr_direct_context_purge_unlocked_resources_bytes (Handle, (IntPtr)bytesToPurge, preferScratchResources);
|
||||
|
||||
internal static new GRContext GetObject (IntPtr handle, bool owns = true) =>
|
||||
internal static GRContext GetObject (IntPtr handle, bool owns = true) =>
|
||||
GetOrAddObject (handle, owns, (h, o) => new GRContext (h, o));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -258,9 +258,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
|
|||
await AddDep("Uno.UI", "xamarinios10");
|
||||
await AddDep("Uno.UI", "xamarinmac20");
|
||||
await AddDep("Uno.UI", "UAP");
|
||||
await AddDep("Microsoft.WindowsAppSDK.Foundation", "net5.0-windows");
|
||||
await AddDep("Microsoft.WindowsAppSDK.WinUI", "net5.0-windows10.0.18362.0");
|
||||
await AddDep("Microsoft.WindowsAppSDK.InteractiveExperiences", "net5.0-windows10.0.17763.0");
|
||||
await AddDep("Microsoft.WindowsAppSDK", "net5.0-windows10.0.18362.0");
|
||||
await AddDep("Microsoft.Maui.Graphics", "netstandard2.0");
|
||||
await AddDep("Microsoft.Windows.SDK.NET.Ref", "");
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,11 @@ var NUGETS_SOURCES = new [] {
|
|||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-7c57ecbd-3/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-5/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-4/nuget/v3/index.json",
|
||||
"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-4/nuget/v3/index.json"
|
||||
};
|
||||
|
||||
void RunNuGetRestorePackagesConfig(FilePath sln)
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-rc.2.*" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-rc.2.*" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -32,11 +32,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.0.0-experimental1" NoWarn="NU1701" />
|
||||
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.26-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
|
||||
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.28-preview2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@
|
|||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
|
||||
<RuntimeFrameworkVersion>5.0.10</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.21" TargetingPackVersion="10.0.19041.21" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
|
||||
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
|
||||
<Manifest Include="$(ApplicationManifest)" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,10 +64,7 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
|
||||
<IncludeAssets>build</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="[1.0.0-experimental1]">
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-preview3]">
|
||||
<IncludeAssets>build</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@
|
|||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<Platforms>x86;x64;arm64</Platforms>
|
||||
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
|
||||
<RuntimeFrameworkVersion>5.0.10</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.21" TargetingPackVersion="10.0.19041.21" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
|
||||
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
|
||||
<Manifest Include="$(ApplicationManifest)" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
<Project>
|
||||
|
||||
<!-- Required - Overwrite tasks that are not needed when multitargeting -->
|
||||
<Target Name="BinPlaceBootstrapDll" />
|
||||
<!-- HACK: Do not copy the native bootstrap files -->
|
||||
<Target Name="_RemoveWasdkBootstrapDll" BeforeTargets="ResolveReferences">
|
||||
<ItemGroup>
|
||||
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)%(Extension)' == 'Microsoft.WindowsAppRuntime.Bootstrap.dll'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
|
||||
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<RuntimeFrameworkVersion>5.0.10</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="exists('..\SkiaSharpSample.UWP')">
|
||||
<EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ variables:
|
|||
XCODE_VERSION: 12.4
|
||||
DOTNET_VERSION_PREVIOUS: 3.1.413
|
||||
DOTNET_VERSION: 5.0.401
|
||||
DOTNET_VERSION_PREVIEW: 6.0.100-rc.2.21505.1
|
||||
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.9.json'
|
||||
DOTNET_VERSION_PREVIEW: 6.0.100-rtm.21525.3
|
||||
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.10.json'
|
||||
VS_VERSION_PREVIEW: 17/pre
|
||||
CONFIGURATION: 'Release'
|
||||
VM_IMAGE_WINDOWS: windows-2022
|
||||
|
|
@ -39,6 +39,8 @@ variables:
|
|||
ENABLE_CODE_COVERAGE: true
|
||||
EMSCRIPTEN_VERSION: 2.0.23
|
||||
XHARNESS_VERSION: 1.0.0-prerelease.21404.1
|
||||
XAMARIN_ANDROID_WINDOWS_URL: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5343278/d17-0/6b0e6b265390832dcfb499e9e1e893c462548a30/signed/Xamarin.Android.Sdk-12.1.0.5.vsix
|
||||
XAMARIN_ANDROID_MACOS_URL: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5343278/d17-0/6b0e6b265390832dcfb499e9e1e893c462548a30/xamarin.android-12.1.0.5.pkg
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
|
|
|
|||
|
|
@ -131,6 +131,15 @@ jobs:
|
|||
# display dotnet info
|
||||
- pwsh: dotnet --info
|
||||
displayName: Display all the .NET information
|
||||
# install updated Android packages
|
||||
- pwsh: dotnet tool install --global boots
|
||||
displayName: Install boots
|
||||
- ${{ if endsWith(parameters.name, '_windows') }}:
|
||||
- pwsh: boots $(XAMARIN_ANDROID_WINDOWS_URL)
|
||||
displayName: Install the upcoming Xamarin.Android
|
||||
- ${{ if endsWith(parameters.name, '_macos') }}:
|
||||
- pwsh: boots $(XAMARIN_ANDROID_MACOS_URL)
|
||||
displayName: Install the upcoming Xamarin.Android
|
||||
|
||||
# select the correct version of the JDK for .NET 6
|
||||
- pwsh: echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
|
||||
|
|
|
|||
|
|
@ -7,19 +7,14 @@ $ErrorActionPreference = 'Stop'
|
|||
|
||||
$env:DOTNET_ROOT="$InstallDir"
|
||||
|
||||
Write-Host "Checking current workloads..."
|
||||
& dotnet workload list
|
||||
& dotnet workload search
|
||||
|
||||
Write-Host "Installing workloads..."
|
||||
Invoke-WebRequest -Uri $SourceUrl -OutFile rollback.json
|
||||
& dotnet workload update --from-rollback-file rollback.json --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install android-aot --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install ios --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install tvos --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install macos --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install maccatalyst --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install wasm-tools --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install maui --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
|
||||
& dotnet workload install `
|
||||
android ios tvos macos maccatalyst wasm-tools maui `
|
||||
--from-rollback-file $SourceUrl `
|
||||
--source https://aka.ms/dotnet6/nuget/index.json `
|
||||
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-7c57ecbd-3/nuget/v3/index.json `
|
||||
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-5/nuget/v3/index.json `
|
||||
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-4/nuget/v3/index.json `
|
||||
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-4/nuget/v3/index.json
|
||||
|
||||
exit $LASTEXITCODE
|
||||
|
|
|
|||
|
|
@ -43,11 +43,7 @@ Write-Host "Setting Environment Variables..."
|
|||
$installationPath = & $vswhere -latest -prerelease -property installationPath
|
||||
Write-Host "##vso[task.prependpath]$installationPath\MSBuild\Current\Bin"
|
||||
Write-Host "##vso[task.setvariable variable=VS_INSTALL]$installationPath"
|
||||
|
||||
Write-Host "Patching MSBuild..."
|
||||
$mypath = $MyInvocation.MyCommand.Path
|
||||
$mypath = Split-Path $mypath -Parent
|
||||
& "$mypath\patch-msbuild.ps1" -MSBuild "$installationPath\MSBuild\Current\Bin\MSBuild.exe"
|
||||
Write-Host "##vso[task.setvariable variable=VSINSTALLDIR]$installationPath"
|
||||
|
||||
Write-Host "Installed Visual Studio Versions:"
|
||||
& $vswhere -all -prerelease -property installationPath
|
||||
|
|
|
|||
|
|
@ -57,6 +57,32 @@
|
|||
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- platform version number information -->
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
|
||||
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-tvos'))">
|
||||
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
|
||||
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>13.1</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-macos'))">
|
||||
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.14</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-android'))">
|
||||
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>21.0</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.Contains('-windows10'))">
|
||||
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="PrintRID"
|
||||
BeforeTargets="BeforeBuild">
|
||||
<Message Text="Operating System: Windows"
|
||||
|
|
|
|||
|
|
@ -62,8 +62,12 @@
|
|||
<PackageReference Include="mdoc" Version="5.8.3" PrivateAssets="All" GeneratePathProperty="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- HACK: WinUI overwrite tasks that are not needed when multitargeting -->
|
||||
<Target Name="BinPlaceBootstrapDll" />
|
||||
<!-- HACK: Do not copy the native bootstrap files -->
|
||||
<Target Name="_RemoveWasdkBootstrapDll" BeforeTargets="ResolveReferences">
|
||||
<ItemGroup>
|
||||
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)%(Extension)' == 'Microsoft.WindowsAppRuntime.Bootstrap.dll'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Workaround for https://github.com/dotnet/sdk/issues/11105
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0-rc.1.21452.15" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.4.2" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ using Windows.UI.Input;
|
|||
#if WINDOWS
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Input;
|
||||
using PointerPoint = Microsoft.UI.Input.Experimental.ExpPointerPoint;
|
||||
using PointerPoint = Microsoft.UI.Input.PointerPoint;
|
||||
using PointerDeviceType = Microsoft.UI.Input.PointerDeviceType;
|
||||
using PointerUpdateKind = Microsoft.UI.Input.PointerUpdateKind;
|
||||
#else
|
||||
using Windows.UI.Xaml;
|
||||
using Windows.UI.Xaml.Input;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<PackagingGroup>SkiaSharp.Views.WinUI</PackagingGroup>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче