Skip to content

Removing all .NET 5 SDK requirements #2266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 12 commits into from
Oct 4, 2022
Merged

Removing all .NET 5 SDK requirements #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa433a2
Removing all .NET 5 SDK requirements
mattleibow Sep 29, 2022
9c98fd3
Remove the old code
mattleibow Sep 29, 2022
ef9cc26
Merge branch 'main' into dev/no-net5.0
mattleibow Sep 30, 2022
681920d
Update azure-templates-bootstrapper.yml
mattleibow Sep 30, 2022
1550df3
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 3, 2022
1067e26
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 4, 2022
81c60e2
Fix the casing on linux
mattleibow Oct 4, 2022
3408965
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 4, 2022
787f2d7
list it all
mattleibow Oct 4, 2022
ace83ec
try this
mattleibow Oct 4, 2022
1cc70e3
Seems to only be there partially
mattleibow Oct 4, 2022
552ca2a
Update azure-pipelines-complete.yml
mattleibow Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions binding/HarfBuzzSharp.Shared/NativeObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,9 @@ public void Dispose ()
GC.SuppressFinalize (this);
}

internal static int SizeOf<T> ()
{
#if WINDOWS_UWP || NETSTANDARD || NET5_0_OR_GREATER
return Marshal.SizeOf<T> ();
#else
return Marshal.SizeOf (typeof (T));
#endif
}

internal static IntPtr StructureArrayToPtr<T> (IReadOnlyList<T> items)
{
var size = SizeOf<T> ();
var size = Marshal.SizeOf<T> ();
var memory = Marshal.AllocCoTaskMem (size * items.Count);
for (var i = 0; i < items.Count; i++) {
var ptr = new IntPtr (memory.ToInt64 () + (i * size));
Expand Down
4 changes: 2 additions & 2 deletions nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
</group>
<group targetFramework="netcoreapp3.1">
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
</group>
</dependencies>

Expand All @@ -56,7 +56,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
</group>
<group targetFramework="netcoreapp3.1">
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
</group>
</dependencies>

Expand All @@ -61,7 +61,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<group targetFramework="netcoreapp3.1">
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
</dependencies>
Expand All @@ -58,7 +58,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/HarfbuzzSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
Expand Down Expand Up @@ -146,9 +142,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/HarfBuzzSharp.dll" />
<file src="lib/netcoreapp3.1/HarfBuzzSharp.pdb" />
<file src="lib/netcoreapp3.1/HarfBuzzSharp.xml" />
<file src="lib/net5.0/HarfBuzzSharp.dll" />
<file src="lib/net5.0/HarfBuzzSharp.pdb" />
<file src="lib/net5.0/HarfBuzzSharp.xml" />
<file src="lib/net6.0/HarfBuzzSharp.dll" />
<file src="lib/net6.0/HarfBuzzSharp.pdb" />
<file src="lib/net6.0/HarfBuzzSharp.xml" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/SkiaSharp.HarfBuzz.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
Expand All @@ -76,9 +72,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.pdb" />
<file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.xml" />
<file src="lib/net5.0/SkiaSharp.HarfBuzz.dll" />
<file src="lib/net5.0/SkiaSharp.HarfBuzz.pdb" />
<file src="lib/net5.0/SkiaSharp.HarfBuzz.xml" />
<file src="lib/net6.0/SkiaSharp.HarfBuzz.dll" />
<file src="lib/net6.0/SkiaSharp.HarfBuzz.pdb" />
<file src="lib/net6.0/SkiaSharp.HarfBuzz.xml" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<group targetFramework="netcoreapp3.1">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
Expand All @@ -71,7 +71,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.NativeAssets.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<group targetFramework="netcoreapp3.1">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
Expand All @@ -59,7 +59,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.NativeAssets.Win32.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
</group>
<group targetFramework="netcoreapp3.1">
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
</group>
</dependencies>

Expand All @@ -57,7 +57,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.NativeAssets.macOS.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
</group>
<group targetFramework="netcoreapp3.1">
</group>
<group targetFramework="net5.0">
<group targetFramework="net6.0">
</group>
</dependencies>

Expand All @@ -62,7 +62,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="lib/net5.0/_._" />
<file src="_._" target="lib/net6.0/_._" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
9 changes: 0 additions & 9 deletions nuget/SkiaSharp.Skottie.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<group targetFramework="netcoreapp3.1">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
Expand Down Expand Up @@ -117,9 +114,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/SkiaSharp.Skottie.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.Skottie.pdb" />
<file src="lib/netcoreapp3.1/SkiaSharp.Skottie.xml" />
<file src="lib/net5.0/SkiaSharp.Skottie.dll" />
<file src="lib/net5.0/SkiaSharp.Skottie.pdb" />
<file src="lib/net5.0/SkiaSharp.Skottie.xml" />
<file src="lib/net6.0/SkiaSharp.Skottie.dll" />
<file src="lib/net6.0/SkiaSharp.Skottie.pdb" />
<file src="lib/net6.0/SkiaSharp.Skottie.xml" />
Expand Down Expand Up @@ -174,9 +168,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.pdb" />
<file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.xml" />
<file src="lib/net5.0/SkiaSharp.SceneGraph.dll" />
<file src="lib/net5.0/SkiaSharp.SceneGraph.pdb" />
<file src="lib/net5.0/SkiaSharp.SceneGraph.xml" />
<file src="lib/net6.0/SkiaSharp.SceneGraph.dll" />
<file src="lib/net6.0/SkiaSharp.SceneGraph.pdb" />
<file src="lib/net6.0/SkiaSharp.SceneGraph.xml" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.Views.Uno.WinUI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="Uno.WinUI" version="1.0.0" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="net5.0-windows10.0.18362.0">
<group targetFramework="net6.0-windows10.0.18362.0">
<dependency id="Uno.WinUI" version="1.0.0" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
Expand Down Expand Up @@ -82,7 +82,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.xml"/>

<!-- Fallback to avoid netstandard2.0 to be used incorrectly and cause hard to troubleshoot build errors -->
<file src="_._" target="lib/net5.0-windows10.0.18362.0/_._" />
<file src="_._" target="lib/net6.0-windows10.0.18362.0/_._" />

<!-- the build bits -->
<file src="build/netstandard2.0/SkiaSharp.Views.Uno.WinUI.targets" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/SkiaSharp.Views.WinUI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

<dependencies>
<group targetFramework="net5.0-windows10.0.18362.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
</group>
<group targetFramework="net6.0-windows10.0.18362.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
Expand All @@ -45,9 +41,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<files>

<!-- SkiaSharp.Views.*.dll -->
<file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
<file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
<file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
<file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
<file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
<file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/SkiaSharp.Vulkan.SharpVk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SharpVk" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SharpVk" version="1.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SharpVk" version="1.0.0" />
Expand All @@ -62,9 +58,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.pdb" />
<file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.xml" />
<file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.dll" />
<file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.pdb" />
<file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.xml" />
<file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.dll" />
<file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.pdb" />
<file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.xml" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/SkiaSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
</group>
<group targetFramework="net5.0">
<dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
<dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
Expand Down Expand Up @@ -150,9 +146,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/netcoreapp3.1/SkiaSharp.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.pdb" />
<file src="lib/netcoreapp3.1/SkiaSharp.xml" />
<file src="lib/net5.0/SkiaSharp.dll" />
<file src="lib/net5.0/SkiaSharp.pdb" />
<file src="lib/net5.0/SkiaSharp.xml" />
<file src="lib/net6.0/SkiaSharp.dll" />
<file src="lib/net6.0/SkiaSharp.pdb" />
<file src="lib/net6.0/SkiaSharp.xml" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
<Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Controls.dll" />
<Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Core\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Core.dll" />
<Reference Include="..\..\..\..\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\bin\Debug\net5.0-windows10.0.18362.0\SkiaSharp.Views.Windows.dll" />-->
<Reference Include="..\..\..\..\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\bin\Debug\net6.0-windows10.0.18362.0\SkiaSharp.Views.Windows.dll" />-->
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\SkiaSharp.Views.Maui.Controls.Compatibility.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\SkiaSharp.Views.Maui.Controls.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>SkiaSharpSample</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\SkiaSharpSample\SkiaSharpSample.csproj</EntryPointProjectUniqueName>
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
<AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>SkiaSharpSample</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup Condition="exists('..\SkiaSharpSample.UWP')">
<EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />
Expand Down
11 changes: 4 additions & 7 deletions scripts/azure-templates-bootstrapper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,6 @@ jobs:
version: 3.1.x
retryCountOnTaskFailure: 3
displayName: Install .NET Core 3.1.x
- task: UseDotNet@2
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
inputs:
packageType: 'sdk'
version: 5.0.x
retryCountOnTaskFailure: 3
displayName: Install .NET Core 5.0.x
- task: UseDotNet@2
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
inputs:
Expand All @@ -192,6 +185,10 @@ jobs:
displayName: Install the preview version of .NET Core
retryCountOnTaskFailure: 3
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables.DOTNET_VERSION_PREVIEW, ''))
- ${{ if endsWith(parameters.name, '_linux') }}:
- pwsh: .\scripts\patch-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet"
displayName: Fix the Microsoft.WinFX.* file
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
# display dotnet info
- pwsh: dotnet --info
displayName: Display all the .NET information
Expand Down
Loading