Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit451d68c

Browse files
committed
Merged PR 33029: Enable automatic Win2D .winmd harvsting for MSIX manifest
Same as !33028 but for WASDK.----#### AI description (iteration 1)#### PR ClassificationNew feature#### PR SummaryThis pull request enables automatic .winmd registration for MSIX apps on .NET 8 and updates several dependencies.- `Microsoft.Graphics.Win2D-WinUI3.targets`: Added automatic .winmd registration.- `Microsoft.Graphics.Win2D-WinUI3.props`: New file for defining .winmd path and implementation DLL name.- `winrt.projection.csproj`, `winrt.test.managed.winappsdk.csproj`, `winrt.test.nativecomponent.projection.csproj`: Updated Windows SDK and CsWinRT versions.- `CHANGELOG.md`: Documented the new feature and updates for version 1.3.1.
1 parent4900a8d commit451d68c

15 files changed

+38
-16
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
#Win2D Changelog
22

3+
##Win2D-WinUI 1.3.1
4+
_December 12th, 2024_
5+
- Fix pause/resume issues with CanvasAnimatedControl
6+
- Remove\[Experimental\] attribute from CanvasAnimatedControl
7+
- Enable automatic .winmd registration for MSIX apps on .NET 8
8+
- Update WindowsAppSDK version to 1.6.241114003
9+
- Update Windows SDK projections and CsWinRT to latest
10+
311
##Win2D-WinUI 1.3.0
412
_October 9th, 2024_
513
- Update Windows SDK projections and CsWinRT to latest

‎build/WindowsAppSdk.common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
When updating the version, don't forget to update all of the package.config files as well.
66
The AzureDevOps pipeline will override the version here by setting NIGHTLY_WINAPPSDK_VERSION in the nightly build.
77
That nightly version is read from \eng\Version.Details.xml-->
8-
<WindowsAppSdkVersionCondition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.6.240923002</WindowsAppSdkVersion>
8+
<WindowsAppSdkVersionCondition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.6.241114003</WindowsAppSdkVersion>
99
<WindowsAppSdkVersionCondition="'$(NIGHTLY_WINAPPSDK_VERSION)' != ''">$(NIGHTLY_WINAPPSDK_VERSION)</WindowsAppSdkVersion>
1010

1111
<_PackagesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages'))</_PackagesPath>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<Win2DWinMDPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Graphics.Canvas.winmd</Win2DWinMDPath>
6+
<Win2DWinMDImplementationDllName>Microsoft.Graphics.Canvas.dll</Win2DWinMDImplementationDllName>
7+
</PropertyGroup>
8+
9+
</Project>

‎build/nuget/Microsoft.Graphics.Win2D-WinUI3.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<WarningText="Microsoft.Graphics.Canvas.dll could not be copied because the AnyCPU platform is being used. Please specify a specific platform to copy this file." />
2525
</Target>
2626

27+
<ItemGroup>
28+
<WindowsMetadataReferenceInclude="$(Win2DWinMDPath)"Implementation="$(Win2DWinMDImplementationDllName)" />
29+
</ItemGroup>
30+
2731
<!--
2832
Don't import Win2D.common.targets here, as it will cause build failures because desktop project
2933
files don't define $(TargetPlatformVersion) with the same semantics as with UWP or C++ project files.

‎build/nuget/Microsoft.Graphics.Win2D.nuspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1515
<tags>graphics 2D Direct2D DirectX WinRT XAML canvas drawing C# C++ Windows Reunion ProjectReunion WindowsAppSdk</tags>
1616
<dependencies>
17-
<dependencyid="Microsoft.WindowsAppSDK"version="1.6.240923002" />
17+
<dependencyid="Microsoft.WindowsAppSDK"version="1.6.241114003" />
1818
</dependencies>
1919
</metadata>
2020

@@ -24,6 +24,7 @@
2424

2525
<filetarget="icon.png"src="build\nuget\icon.png" />
2626
<filetarget="build\native\Microsoft.Graphics.Win2D.targets"src="build\nuget\Microsoft.Graphics.Win2D-native.targets" />
27+
<filetarget="build\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.props"src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.props" />
2728
<filetarget="build\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.targets"src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.targets" />
2829
<filetarget="build\net45\Microsoft.Graphics.Win2D.targets"src="build\nuget\Microsoft.Graphics.Win2D-managed.targets" />
2930
<filetarget="build\win10\Microsoft.Graphics.Win2D.targets"src="build\nuget\Microsoft.Graphics.Win2D-win10.targets" />

‎build/nuget/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.3.1

‎build/pkges/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.WindowsAppSdk"version="1.6.240923002"targetFramework="native" />
3+
<packageid="Microsoft.WindowsAppSdk"version="1.6.241114003"targetFramework="native" />
44
</packages>

‎winrt/dll/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.WindowsAppSdk"version="1.6.240923002"targetFramework="native" />
3+
<packageid="Microsoft.WindowsAppSdk"version="1.6.241114003"targetFramework="native" />
44
</packages>

‎winrt/lib/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<packageid="Microsoft.Web.WebView2"version="1.0.2792.45"targetFramework="native" />
44
<packageid="Microsoft.Windows.AbiWinRT"version="2.0.210330.2"targetFramework="native" />
55
<packageid="Microsoft.Windows.MidlRT"version="2.0.200924.1"targetFramework="native" />
6-
<packageid="Microsoft.WindowsAppSdk"version="1.6.240923002"targetFramework="native" />
6+
<packageid="Microsoft.WindowsAppSdk"version="1.6.241114003"targetFramework="native" />
77
</packages>

‎winrt/projection/winrt.projection.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- Set "AssemblyFile" to match the assembly version.
2121
- Set "AssemblyInformationVersion" to $(Version) plus git hash (eg. "1.1.0-preview1+1b95cfe91e").
2222
-->
23-
<Version>1.3.0</Version>
23+
<Version>1.3.1</Version>
2424

2525
<!-- Enable trimming-->
2626
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
@@ -35,7 +35,7 @@
3535

3636
<!-- CsWinRT related properties for projections generation-->
3737
<PropertyGroup>
38-
<WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
38+
<WindowsSdkPackageVersion>10.0.19041.52</WindowsSdkPackageVersion>
3939
<CSWinRTIncludes>
4040
Microsoft.Graphics.Canvas;
4141
</CSWinRTIncludes>
@@ -52,7 +52,7 @@
5252
<ItemGroup>
5353
<PackageReferenceInclude="Microsoft.Web.WebView2"Version="1.0.2792.45" />
5454
<PackageReferenceInclude="Microsoft.WindowsAppSdk"Version="$(WindowsAppSdkVersion)" />
55-
<PackageReferenceInclude="Microsoft.Windows.CSWinRT"Version="2.1.5" />
55+
<PackageReferenceInclude="Microsoft.Windows.CSWinRT"Version="2.1.6" />
5656
<PackageReferenceInclude="Microsoft.SourceLink.AzureRepos.Git"Version="1.1.1"PrivateAssets="All" />
5757
</ItemGroup>
5858
</Project>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp