Update the tools for the new .NET universe

mono · Aug 21, 2023 · 3e5529c · 3e5529c
1 parent 9c36d55
commit 3e5529c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/build.cake b/build.cake
@@ -1,4 +1,5 @@
 var TARGET = Argument("t", Argument("target", "Default"));
+var CONFIGURATION = Argument("c", Argument("configuration", "Release"));
 var PREVIEW_LABEL = Argument ("previewLabel", EnvironmentVariable ("PREVIEW_LABEL") ?? "preview");
 var BUILD_NUMBER = Argument ("buildNumber", EnvironmentVariable ("BUILD_NUMBER") ?? "0");
 var GIT_SHA = Argument ("gitSha", EnvironmentVariable ("GIT_SHA") ?? "");
@@ -10,7 +11,7 @@ Task("build")
 	var settings = new MSBuildSettings()
 		{ AllowPreviewVersion = true }
 		.EnableBinaryLogger("./output/binlogs/build.binlog")
-		.SetConfiguration("Release")
+		.SetConfiguration(CONFIGURATION)
 		.SetMaxCpuCount(0)
 		.WithRestore();
 
@@ -23,7 +24,7 @@ Task("pack")
 	MSBuild("./SkiaSharp.Extended-Pack.slnf", new MSBuildSettings()
 		{ AllowPreviewVersion = true }
 		.EnableBinaryLogger("./output/binlogs/pack.binlog")
-		.SetConfiguration("Release")
+		.SetConfiguration(CONFIGURATION)
 		.SetMaxCpuCount(0)
 		.WithRestore()
 		.WithProperty("PackageOutputPath", MakeAbsolute(new FilePath("./output/")).FullPath)
@@ -37,7 +38,7 @@ Task("pack")
 	MSBuild("./SkiaSharp.Extended-Pack.slnf", new MSBuildSettings()
 		{ AllowPreviewVersion = true }
 		.EnableBinaryLogger("./output/binlogs/pack-preview.binlog")
-		.SetConfiguration("Release")
+		.SetConfiguration(CONFIGURATION)
 		.SetMaxCpuCount(0)
 		.WithRestore()
 		.WithProperty("PackageOutputPath", MakeAbsolute(new FilePath("./output/")).FullPath)
@@ -59,7 +60,7 @@ Task("test")
 
 		try {
 			DotNetTest(csproj.FullPath, new DotNetTestSettings {
-				Configuration = "Release",
+				Configuration = CONFIGURATION,
 				Loggers = new [] { $"trx;LogFileName={csproj.GetFilenameWithoutExtension()}.trx" },
 			});
 		} catch (Exception) {

diff --git a/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,10 +14,10 @@
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +42,30 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
@@ -88,6 +112,9 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
   </ItemGroup>
@@ -99,7 +126,7 @@
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.137" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.10" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\source\SkiaSharp.Extended.UI.Forms\SkiaSharp.Extended.UI.Forms.csproj">

diff --git a/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj b/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DefineConstants>$(DefineConstants);XAMARIN_FORMS</DefineConstants>
   </PropertyGroup>
 

diff --git a/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <UseWpf>true</UseWpf>
     <DefineConstants>$(DefineConstants);XAMARIN_FORMS</DefineConstants>
   </PropertyGroup>