v1.0.1518.46-preview.230207.17 / 1.23.10207.11751

AigioL · AigioL · commit 54d0a6738e1e · 2023-02-07T18:15:35.000+08:00
diff --git a/Avalonia.WebView2.sln b/Avalonia.WebView2.sln
@@ -10,8 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Root", "_Root", "{61E7D838
 		src\.editorconfig = src\.editorconfig
 		.gitignore = .gitignore
 		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Packages.props = src\Directory.Packages.props
+		ref\DirectoryPackages\Directory.Packages.props = ref\DirectoryPackages\Directory.Packages.props
+		src\GeneratePackage.props = src\GeneratePackage.props
 		README.md = README.md
+		src\WebView2.NativeAssets.Win32.nuspec = src\WebView2.NativeAssets.Win32.nuspec
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.WebView2.Sample", "src\Avalonia.WebView2.Sample\Avalonia.WebView2.Sample.csproj", "{A08F349B-7924-440B-A3B6-A06A07BD3568}"
diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages
@@ -1 +1 @@
-Subproject commit fec441eae7c23194471677b38be8724b7d4daced
+Subproject commit 461cb7e57c06ea192c082472b7633aa26c190b55
diff --git a/ref/Microsoft.Web.WebView2/lib/net45/Microsoft.Web.WebView2.Core.dll b/ref/Microsoft.Web.WebView2/lib/net45/Microsoft.Web.WebView2.Core.dll
diff --git a/ref/Microsoft.Web.WebView2/lib/net45/Microsoft.Web.WebView2.Core.xml b/ref/Microsoft.Web.WebView2/lib/net45/Microsoft.Web.WebView2.Core.xml
diff --git a/ref/Microsoft.Web.WebView2/lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll b/ref/Microsoft.Web.WebView2/lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll
diff --git a/ref/Microsoft.Web.WebView2/lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.xml b/ref/Microsoft.Web.WebView2/lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.xml
diff --git a/ref/Microsoft.Web.WebView2/runtimes/win-arm64/native/WebView2Loader.dll b/ref/Microsoft.Web.WebView2/runtimes/win-arm64/native/WebView2Loader.dll
diff --git a/ref/Microsoft.Web.WebView2/runtimes/win-x64/native/WebView2Loader.dll b/ref/Microsoft.Web.WebView2/runtimes/win-x64/native/WebView2Loader.dll
diff --git a/ref/Microsoft.Web.WebView2/runtimes/win-x86/native/WebView2Loader.dll b/ref/Microsoft.Web.WebView2/runtimes/win-x86/native/WebView2Loader.dll
diff --git a/src/Avalonia.Ref/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Ref/Avalonia.Desktop/Avalonia.Desktop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net7.0;net7.0-windows</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>..\avalonia.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Avalonia.Ref/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Ref/Avalonia.Native/Avalonia.Native.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net7.0;net7.0-windows</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>..\avalonia.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Avalonia.Ref/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.Ref/Avalonia.X11/Avalonia.X11.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>..\avalonia.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Avalonia.WebView2.Sample/App.xaml.cs b/src/Avalonia.WebView2.Sample/App.xaml.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.WebView2.Sample;
 
-public class App : Application
+public sealed class App : Application
 {
     public override void Initialize()
     {
diff --git a/src/Avalonia.WebView2.Sample/Avalonia.WebView2.Sample.csproj b/src/Avalonia.WebView2.Sample/Avalonia.WebView2.Sample.csproj
@@ -2,8 +2,21 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<AllowedReferenceRelatedFileExtensions>
+			<!-- Prevent default XML and PDB files copied to output in RELEASE. 
+           Only *.allowedextension files will be included, which doesn't exist in my case.
+       -->
+			.allowedextension
+		</AllowedReferenceRelatedFileExtensions>
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/Avalonia.WebView2.Sample/MainWindow.xaml.cs b/src/Avalonia.WebView2.Sample/MainWindow.xaml.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.WebView2.Sample;
 
-public partial class MainWindow : Window
+public sealed partial class MainWindow : Window
 {
     readonly Button Button;
     readonly WebView2Compat WebView2Compat;
@@ -25,7 +25,7 @@ public MainWindow()
         UrlTextBox = this.FindControl<TextBox>("UrlTextBox");
         AboutTextBlock = this.FindControl<TextBlock>("AboutTextBlock");
 
-        AboutTextBlock.Text = $"OSArchitecture: {RuntimeInformation.OSArchitecture}{System.Environment.NewLine}ProcessArchitecture: {RuntimeInformation.ProcessArchitecture}{System.Environment.NewLine}Avalonia: {GetVersion(typeof(Window).Assembly)}{System.Environment.NewLine}Avalonia.WebView2: {GetVersion(typeof(AvaloniaWebView2).Assembly)}{System.Environment.NewLine}Microsoft.Web.WebView2.Core: {GetVersion(typeof(CoreWebView2).Assembly)}";
+        AboutTextBlock.Text = $"Runtime: {System.Environment.Version}{System.Environment.NewLine}OSArchitecture: {RuntimeInformation.OSArchitecture}{System.Environment.NewLine}ProcessArchitecture: {RuntimeInformation.ProcessArchitecture}{System.Environment.NewLine}Avalonia: {GetVersion(typeof(Window).Assembly)}{System.Environment.NewLine}Avalonia.WebView2: {GetVersion(typeof(AvaloniaWebView2).Assembly)}{System.Environment.NewLine}Microsoft.Web.WebView2.Core: {GetVersion(typeof(CoreWebView2).Assembly)}";
         Button.Click += Button_Click;
         if (AvaloniaWebView2.IsSupported)
         {
diff --git a/src/Avalonia.WebView2.Sample/Properties/PublishProfiles/win-x64.pubxml b/src/Avalonia.WebView2.Sample/Properties/PublishProfiles/win-x64.pubxml
@@ -3,14 +3,14 @@
 	<PropertyGroup>
 		<Configuration>Release</Configuration>
 		<Platform>Any CPU</Platform>
-		<PublishDir>bin\Release\Publish\</PublishDir>
+		<PublishDir>bin\Release\Publish</PublishDir>
 		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
 		<SelfContained>true</SelfContained>
 		<PublishSingleFile>true</PublishSingleFile>
 		<PublishReadyToRun>false</PublishReadyToRun>
-		<PublishTrimmed>true</PublishTrimmed>
+		<PublishTrimmed>false</PublishTrimmed>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 	</PropertyGroup>
 </Project>
diff --git a/src/Avalonia.WebView2.Sample/WebView2Compat.xaml.cs b/src/Avalonia.WebView2.Sample/WebView2Compat.xaml.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.WebView2.Sample;
 
-public partial class WebView2Compat : UserControl
+public sealed partial class WebView2Compat : UserControl
 {
     public readonly AvaloniaWebView2 WebView2;
     public readonly TextBlock TextBlock;
diff --git a/src/Avalonia.WebView2/Avalonia.WebView2.csproj b/src/Avalonia.WebView2/Avalonia.WebView2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net461;netcoreapp3.0;net5.0;net5.0-windows;net6.0;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net461;netcoreapp3.0;net7.0;net7.0-windows;net6.0;net6.0-windows</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<RootNamespace>Avalonia.Controls</RootNamespace>
 		<PackageId>WebView2.Avalonia</PackageId>
@@ -10,23 +10,18 @@
 			This package is necessary for Avalonia applications. To learn more about package versions checkout https://aka.ms/wv2-packageversion. To learn best practices checkout: https://aka.ms/wv2-bestpractices.
 		</Description>
 		<PackageTags>Web WebView Native native package Edge avalonia avaloniaui dotnet framework core Webview2</PackageTags>
-		<Version>1.0.1264.42-preview.220713.10</Version>
+		<Version>1.0.1518.46-preview.230207.17</Version>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<AvaloniaXaml Include="**\*.xaml" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Avalonia" />
 		<PackageReference Include="WebView2.NativeAssets.Win32" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
 	</ItemGroup>
 
+	<Import Project="..\GeneratePackage.props" />
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,25 +6,11 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<PackageProjectUrl>https://github.com/BeyondDimension/Avalonia.WebView2</PackageProjectUrl>
-		<PackageReleaseNotes>$(PackageProjectUrl)/releases</PackageReleaseNotes>
-		<RepositoryBranch>master</RepositoryBranch>
-		<RepositoryType>git</RepositoryType>
-		<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<CheckEolTargetFramework>false</CheckEolTargetFramework>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)'=='Release'">
-		<AllowedReferenceRelatedFileExtensions>
-			<!-- Prevent default XML and PDB files copied to output in RELEASE. 
-           Only *.allowedextension files will be included, which doesn't exist in my case.
-       -->
-			.allowedextension
-		</AllowedReferenceRelatedFileExtensions>
-		<DebugType>none</DebugType>
-		<DebugSymbols>false</DebugSymbols>
+		<Version>1.23.10207.11751</Version>
+		<Copyright />
+		<Company />
+		<FileVersion>$(Version)</FileVersion>
+		<AssemblyVersion>$(Version)</AssemblyVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,14 +1,3 @@
 <Project>
-	<ItemGroup>
-		<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
-		<PackageVersion Include="Avalonia" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.Desktop" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.Diagnostics" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.Native" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.Win32" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.X11" Version="0.10.16" />
-		<PackageVersion Include="Avalonia.Skia" Version="0.10.16" />
-		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-		<PackageVersion Include="WebView2.NativeAssets.Win32" Version="1.0.1264.43" />
-	</ItemGroup>
-</Project>
+	<Import Project="..\ref\DirectoryPackages\Directory.Packages.props" />
+</Project>
diff --git a/src/GeneratePackage.props b/src/GeneratePackage.props
@@ -0,0 +1,23 @@
+<Project>
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageProjectUrl>https://github.com/BeyondDimension/Avalonia.WebView2</PackageProjectUrl>
+		<PackageReleaseNotes>$(PackageProjectUrl)/releases</PackageReleaseNotes>
+		<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryBranch>main</RepositoryBranch>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<PackageOutputPath>$(MSBuildProjectDirectory)\..\..\pkg</PackageOutputPath>
+		<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
+	</ItemGroup>
+</Project>
diff --git a/src/WebView2.NativeAssets.Win32.bat b/src/WebView2.NativeAssets.Win32.bat
@@ -1 +1 @@
-nuget pack WebView2.NativeAssets.Win32.nuspec
+nuget pack WebView2.NativeAssets.Win32.nuspec -OutputDirectory ..\pkg
diff --git a/src/WebView2.NativeAssets.Win32.nuspec b/src/WebView2.NativeAssets.Win32.nuspec
@@ -3,7 +3,7 @@
 	<metadata minClientVersion="2.12">
 		<id>WebView2.NativeAssets.Win32</id>
 		<title>WebView2.NativeAssets.Win32</title>
-		<version>1.0.1264.43</version>
+		<version>1.0.1518.46</version>
 		<authors>https://github.com/AigioL</authors>
 		 <copyright>© Microsoft Corporation. All rights reserved.</copyright>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
