Skip to content

Commit 923e97c

Browse files
committed
Merge remote-tracking branch 'origin/release/6.0.5xx-sr5' into release/7.0.1xx-rc1
2 parents 6e9389d + 543acc9 commit 923e97c

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

NuGet.config

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
1919
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
2020
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
21-
<add key="skiasharp-stable-sha-signed" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/skiasharp-stable-88c09609-signed/nuget/v3/index.json" />
2221
<add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
2322
<!-- Added manually for dotnet/runtime 6.0.9 -->
2423
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
-->
6060
<_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
6161
<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
62-
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.88c096095fc1cf61a64b47b7044e9e89e3f6c097.480</_SkiaSharpNativeAssetsVersion>
62+
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
6363
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
6464
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22429.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
6565
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22429.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>

src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1212
<PackageReference Include="Microsoft.Build.Framework" Version="16.7.0" PrivateAssets="all" />
1313
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" PrivateAssets="all" />
14-
<PackageReference Include="SkiaSharp" Version="2.88.1" />
14+
<PackageReference Include="SkiaSharp" Version="$(_SkiaSharpVersion)" />
1515
<PackageReference Include="SkiaSharp.Extended" Version="2.0.0-preview.61" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

0 commit comments

Comments
 (0)