Skip to content
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

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

Merged
merged 21 commits into from
Mar 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b2bc042
Migrate to 1ES PT for 2.x
mattleibow Mar 8, 2024
7c39fd9
sigh
mattleibow Mar 8, 2024
1f8d00c
Slightly better
mattleibow Mar 9, 2024
4538092
surrogates
mattleibow Mar 9, 2024
214c8a6
and this
mattleibow Mar 9, 2024
00bef03
oops
mattleibow Mar 9, 2024
691ca99
Update azure-templates-stages.yml
mattleibow Mar 9, 2024
abbdc95
this
mattleibow Mar 10, 2024
207d1a3
split this up for better things
mattleibow Mar 10, 2024
93b202a
this
mattleibow Mar 11, 2024
a7eb82e
Use the new connection string
mattleibow Mar 22, 2024
5c421bf
VM_IMAGE_HOST
mattleibow Mar 25, 2024
46337b8
VM_IMAGE_HOST
mattleibow Mar 25, 2024
44c1d47
:|
mattleibow Mar 25, 2024
293cee8
more things and hopes
mattleibow Mar 26, 2024
86718d0
Update azure-templates-bootstrapper.yml
mattleibow Mar 26, 2024
ca1bf78
found it
mattleibow Mar 26, 2024
f031e6e
Update azure-templates-stages.yml
mattleibow Mar 26, 2024
ad7cfa1
Update azure-templates-stages.yml
mattleibow Mar 26, 2024
b376922
:(
mattleibow Mar 26, 2024
64209e4
Update APIScanSurrogates.in.xml
mattleibow Mar 27, 2024
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
1 change: 1 addition & 0 deletions VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
Expand Down
8 changes: 8 additions & 0 deletions native/uwp/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -190,6 +191,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
Expand All @@ -205,6 +207,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
Expand All @@ -220,6 +223,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
Expand All @@ -235,6 +239,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
Expand All @@ -250,6 +255,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -265,6 +271,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -280,6 +287,7 @@
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion native/uwp/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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\")",
});
}
}
Expand Down
8 changes: 8 additions & 0 deletions native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion native/windows/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand Down
6 changes: 6 additions & 0 deletions native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -163,6 +164,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
Expand All @@ -178,6 +180,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -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'">
Expand All @@ -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'">
Expand All @@ -235,6 +240,7 @@
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
54 changes: 54 additions & 0 deletions nuget/SkiaSharp.Views.NativeAssets.UWP.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 1 addition & 6 deletions nuget/SkiaSharp.Views.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />

Expand Down
0 SignList.xml → scripts/SignList.xml
View file
Open in desktop
File renamed without changes.
Loading
Loading