Include static lib

azure-pipelines.yml

@@ -67,8 +67,11 @@ jobs:
     inputs:
       script:  |
         ren .\out\arm64\libGLESv2.dll av_libGLESv2.dll
+        ren .\out\arm64\libGLESv2.dll.lib av_libGLESv2.lib
         ren .\out\x64\libGLESv2.dll av_libGLESv2.dll
+        ren .\out\x64\libGLESv2.dll.lib av_libGLESv2.lib
         ren .\out\x86\libGLESv2.dll av_libGLESv2.dll
+        ren .\out\x86\libGLESv2.dll.lib av_libGLESv2.lib
 
   - task: CmdLine@2
     displayName: 'Clear Artifacts Dir'

nuget/Avalonia.Angle.Windows.Natives.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
-		<PackageVersion>2.1.22045.20230930</PackageVersion>
+		<PackageVersion>2.1.22083.20231008</PackageVersion>
     	<Authors>Avalonia Team</Authors>
     	<Copyright>Copyright 2013-$([System.DateTime]::Now.ToString(`yyyy`)) &#169; The AvaloniaUI Project</Copyright>		
 		<PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
@@ -18,16 +18,37 @@
 			<Pack>true</Pack>
 			<PackagePath>runtimes\win-x64\native</PackagePath>
 		</Content>
+		<Content Include="..\out\x64\av_libglesv2.lib">
+			<Pack>true</Pack>
+			<PackagePath>runtimes\win-x64\native</PackagePath>
+		</Content>
 
 		<Content Include="..\out\x86\av_libglesv2.dll">
 			<Pack>true</Pack>
 			<PackagePath>runtimes\win-x86\native</PackagePath>
 		</Content>
+		<Content Include="..\out\x86\av_libglesv2.lib">
+			<Pack>true</Pack>
+			<PackagePath>runtimes\win-x86\native</PackagePath>
+		</Content>
 
 		<Content Include="..\out\arm64\av_libglesv2.dll">
 			<Pack>true</Pack>
 			<PackagePath>runtimes\win-arm64\native</PackagePath>
 		</Content>
+		<Content Include="..\out\arm64\av_libglesv2.lib">
+			<Pack>true</Pack>
+			<PackagePath>runtimes\win-arm64\native</PackagePath>
+		</Content>
+
+		<Content Include="*.props">
+			<Pack>true</Pack>
+			<PackagePath>build\</PackagePath>
+		</Content>
+		<Content Include="*.targets">
+			<Pack>true</Pack>
+			<PackagePath>build\;buildTransitive\</PackagePath>
+		</Content>
 
     	<None Include="$(MSBuildThisFileDirectory)/Icon.png">
 			<Pack>true</Pack>

nuget/Avalonia.Angle.Windows.Natives.targets

@@ -1,40 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <!-- if ShouldIncludeNativeAngleBinaries == False then don't include the native libAngleBinaries -->
+<Project>
     <PropertyGroup>
-        <ShouldIncludeNativeAngleBinaries Condition=" '$(ShouldIncludeNativeAngleBinaries)' == '' ">True</ShouldIncludeNativeAngleBinaries>
+        <StaticAvaloniaAngleLinking Condition=" '$(StaticAvaloniaAngleLinking)' == '' ">false</StaticAvaloniaAngleLinking>
+        
+        <_AngleBinariesRuntimePath Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.EndsWith('x64'))">$(MSBuildThisFileDirectory)\runtimes\win-x64\native</_AngleBinariesRuntimePath>
+        <_AngleBinariesRuntimePath Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.EndsWith('x86'))">$(MSBuildThisFileDirectory)\runtimes\win-x86\native</_AngleBinariesRuntimePath>
+        <_AngleBinariesRuntimePath Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.EndsWith('arm64'))">$(MSBuildThisFileDirectory)\runtimes\win-arm64\native</_AngleBinariesRuntimePath>
     </PropertyGroup>
 
-    <!-- get the preferred architecture -->
-    <PropertyGroup>
-        <!-- handle VS 2017 live unit testing -->
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' and '$(BuildingForLiveUnitTesting)' == 'true' and '$(PlatformTarget)' == '' ">x86</PreferredNativeAngleBinaries>
-
-        <!-- handle x86/x64 specifically -->
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' and ( '$(PlatformTarget)' == 'x64' or '$(PlatformTarget)' == 'x86' ) ">$(PlatformTarget)</PreferredNativeAngleBinaries> 
-        <!-- handle Any CPU, considering Prefer32Bit -->
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' and '$(Prefer32Bit)' == 'False' ">x64</PreferredNativeAngleBinaries>  
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' and '$(Prefer32Bit)' == 'True' ">x86</PreferredNativeAngleBinaries> 
-        <!-- fall back to x64 on 64-bit machines -->
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' and $([System.Environment]::Is64BitOperatingSystem) ">x64</PreferredNativeAngleBinaries> 
-        <!-- fall back to x86 -->
-        <PreferredNativeAngleBinaries Condition=" '$(PreferredNativeAngleBinaries)' == '' ">x86</PreferredNativeAngleBinaries>
-    </PropertyGroup>
-
-    <!-- get the preferred paths -->
-    <PropertyGroup>
-        <WindowsNativeAngleBinariesPath>$(MSBuildThisFileDirectory)..\..\runtimes\win-$(PreferredNativeAngleBinaries)\native\libAngleBinaries.dll</WindowsNativeAngleBinariesPath>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(ShouldIncludeNativeAngleBinaries)' != 'False' ">
-        <None Include="$(WindowsNativeAngleBinariesPath)\libglesv2.dll" >
-            <Link>$([System.IO.Path]::GetFilename('$(WindowsNativeAngleBinariesPath)\libglesv2.dll'))</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-		<None Include="$(WindowsNativeAngleBinariesPath)\libegl.dll" >
-            <Link>$([System.IO.Path]::GetFilename('$(WindowsNativeAngleBinariesPath)\libegl.dll'))</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+    <ItemGroup Condition="'$(StaticAvaloniaAngleLinking)' == 'true' and '$(NativeLib)' != 'Static' and '$(_AngleBinariesRuntimePath)' != ''">
+      <NativeLibrary Include="$(_AngleBinariesRuntimePath)\av_libglesv2.lib" />
+      <DirectPInvoke Include="av_libglesv2" />
     </ItemGroup>
 </Project>