[release/2.x] Clean up APIScan and other compliance yaml (#2805)

mono · Mar 27, 2024 · a4e98b5 · a4e98b5
1 parent fa98ae0
commit a4e98b5
Show file tree

Hide file tree

Showing 26 changed files with 824 additions and 309 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -69,6 +69,7 @@ SkiaSharp.NativeAssets.UWP                      nuget       2.88.8
 SkiaSharp.NativeAssets.watchOS                  nuget       2.88.8
 SkiaSharp.NativeAssets.Win32                    nuget       2.88.8
 SkiaSharp.Views                                 nuget       2.88.8
+SkiaSharp.Views.NativeAssets.UWP                nuget       2.88.8
 SkiaSharp.Views.Desktop.Common                  nuget       2.88.8
 SkiaSharp.Views.Gtk2                            nuget       2.88.8
 SkiaSharp.Views.Gtk3                            nuget       2.88.8

diff --git a/build.cake b/build.cake
@@ -81,6 +81,7 @@ var TRACKED_NUGETS = new Dictionary<string, Version> {
     { "SkiaSharp.NativeAssets.watchOS",                new Version (1, 60, 0) },
     { "SkiaSharp.NativeAssets.Win32",                  new Version (1, 60, 0) },
     { "SkiaSharp.Views",                               new Version (1, 60, 0) },
+    { "SkiaSharp.Views.NativeAssets.UWP",              new Version (1, 60, 0) },
     { "SkiaSharp.Views.Desktop.Common",                new Version (1, 60, 0) },
     { "SkiaSharp.Views.Gtk2",                          new Version (1, 60, 0) },
     { "SkiaSharp.Views.Gtk3",                          new Version (1, 60, 0) },

diff --git a/native/uwp/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj b/native/uwp/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj
@@ -175,6 +175,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -190,6 +191,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -205,6 +207,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -220,6 +223,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -235,6 +239,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -250,6 +255,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -265,6 +271,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -280,6 +287,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/native/uwp/build.cake b/native/uwp/build.cake
@@ -42,7 +42,7 @@ Task("libSkiaSharp")
             $"extra_cflags=[  " +
             $"  '-DSKIA_C_DLL', '/MD{d}', '/EHsc', '/Z7', " +
             $"  '-DSK_HAS_DWRITE_1_H', '-DSK_HAS_DWRITE_2_H', '-DNO_GETENV', '-D_HAS_AUTO_PTR_ETC=1' ] " +
-            $"extra_ldflags=[ '/DEBUG:FULL' ]");
+            $"extra_ldflags=[ '/DEBUG:FULL', '/DEBUGTYPE:CV,FIXUP' ]");
 
         var outDir = OUTPUT_PATH.Combine(dir);
         EnsureDirectoryExists(outDir);
@@ -136,6 +136,7 @@ Task("ANGLE")
                 System.IO.File.AppendAllLines(cmake.FullPath, new [] {
                     $"set(VCPKG_PLATFORM_TOOLSET \"{platform_toolset}\")",
                     $"set(VCPKG_DEP_INFO_OVERRIDE_VARS \"{platform_toolset}\")",
+                    $"set(VCPKG_LINKER_FLAGS \"/DEBUG:FULL /DEBUGTYPE:CV,FIXUP\")",
                 });
             }
         }

diff --git a/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
@@ -186,6 +186,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -201,6 +202,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
@@ -216,6 +218,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -231,6 +234,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
@@ -246,6 +250,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -261,6 +266,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -276,6 +282,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -291,6 +298,7 @@
       <SubSystem>Console</SubSystem>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/native/windows/build.cake b/native/windows/build.cake
@@ -53,7 +53,7 @@ Task("libSkiaSharp")
             clang +
             win_vcvars_version +
             $"extra_cflags=[ '-DSKIA_C_DLL', '/MT{d}', '/EHsc', '/Z7', '-D_HAS_AUTO_PTR_ETC=1' ] " +
-            $"extra_ldflags=[ '/DEBUG:FULL' ] " +
+            $"extra_ldflags=[ '/DEBUG:FULL', '/DEBUGTYPE:CV,FIXUP' ] " +
             ADDITIONAL_GN_ARGS);
 
         var outDir = OUTPUT_PATH.Combine($"{VARIANT}/{dir}");

diff --git a/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
@@ -148,6 +148,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,6 +164,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -178,6 +180,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -197,6 +200,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -216,6 +220,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -235,6 +240,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/nuget/SkiaSharp.Views.NativeAssets.UWP.nuspec b/nuget/SkiaSharp.Views.NativeAssets.UWP.nuspec
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+
+    <!-- package -->
+    <id>SkiaSharp.Views.NativeAssets.UWP</id>
+    <title>SkiaSharp Views &amp; Layers - Native Assets for UWP</title>
+    <version>1.0.0</version>
+    <description>
+SkiaSharp Views &amp; Layers are a set of platform-specific views and containers that can be used to draw on the screen.
+    </description>
+    <summary>
+SkiaSharp Views &amp; Layers are a set of platform-specific views and containers that can be used to draw on the screen.
+    </summary>
+    <releaseNotes>
+Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release notes.
+    </releaseNotes>
+    <projectUrl>https://go.microsoft.com/fwlink/?linkid=868515</projectUrl>
+    <iconUrl>https://go.microsoft.com/fwlink/?linkid=2130524</iconUrl>
+    <tags>ui xamarin graphics ios android linux windows uwp tvos watchos macos tizen cross-platform skiasharp</tags>
+
+    <!-- legal -->
+    <licenseUrl>https://go.microsoft.com/fwlink/?linkid=868514</licenseUrl>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+
+    <dependencies>
+      <group targetFramework="uap10.0">
+      </group>
+    </dependencies>
+
+  </metadata>
+  <files>
+
+    <!-- placeholders -->
+    <file src="_._" target="lib/uap10.0/_._" />
+
+    <!-- SkiaSharp.Views.Interop.UWP.dll -->
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.pdb" />
+
+    <!-- legal -->
+    <file src="LICENSE.txt" />
+
+  </files>
+</package>
diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec
@@ -36,6 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       </group>
       <group targetFramework="uap10.0">
         <dependency id="SkiaSharp" version="1.0.0" />
+        <dependency id="SkiaSharp.Views.NativeAssets.UWP" version="1.0.0" />
       </group>
       <group targetFramework="monoandroid1.0">
         <dependency id="SkiaSharp" version="1.0.0" />
@@ -123,12 +124,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.pdb" />
     <file src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.xml" />
 
-    <!-- SkiaSharp.Views.Interop.UWP.dll -->
-    <file src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file src="runtimes/win10-x86/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file src="runtimes/win10-arm/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file src="runtimes/win10-arm64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-
     <!-- legal -->
     <file src="LICENSE.txt" />
 

diff --git a/SignList.xml → scripts/SignList.xml b/SignList.xml → scripts/SignList.xml