Skip to content

Commit 3fc8668

Browse files
marcelwgnmarcelwgn
committed
Make project NAOT compatible
1 parent db5fe62 commit 3fc8668

File tree

10 files changed

+60
-27
lines changed

10 files changed

+60
-27
lines changed

‎src/PagerControlPolyfill/PagerControlAutomationPeer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace PagerControlPolyfill
66
{
77
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1024:Use properties where appropriate", Justification = "This is part of the WinUI API, must not change.")]
88
[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "This is part of the WinUI API, must not change.")]
9-
public class PagerControlAutomationPeer : FrameworkElementAutomationPeer
9+
public partial class PagerControlAutomationPeer : FrameworkElementAutomationPeer
1010
{
1111
public PagerControlAutomationPeer(PagerControl owner) : base(owner)
1212
{

‎src/PagerControlPolyfill/PagerControlPolyfill.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
3+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
44
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
55
<RootNamespace>PagerControlPolyfill</RootNamespace>
6-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
76
<UseWinUI>true</UseWinUI>
87
<Nullable>enable</Nullable>
8+
<IsAotCompatible>true</IsAotCompatible>
9+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎tests/PagerControlPolyFill.TestApp/PagerControlPolyfill.TestApp.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1111
<UseWinUI>true</UseWinUI>
1212
<EnableMsixTooling>true</EnableMsixTooling>
13+
<IsAotCompatible>true</IsAotCompatible>
14+
<PublishAot>true</PublishAot>
1315
</PropertyGroup>
1416

1517
<ItemGroup>

‎tests/PagerControlPolyFill.TestApp/Properties/PublishProfiles/win-arm64.pubxml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>ARM64</Platform>
8+
<Platform>arm64</Platform>
99
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win-arm64\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
1318
</PropertyGroup>
1419
</Project>

‎tests/PagerControlPolyFill.TestApp/Properties/PublishProfiles/win-x64.pubxml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6-
<PropertyGroup>
7-
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>x64</Platform>
9-
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11-
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
13-
</PropertyGroup>
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>x64</Platform>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10+
<PublishDir>bin\\\win-x64\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
18+
</PropertyGroup>
1419
</Project>

‎tests/PagerControlPolyFill.TestApp/Properties/PublishProfiles/win-x86.pubxml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>x86</Platform>
8+
<Platform>win-x86</Platform>
99
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win-x86\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
1318
</PropertyGroup>
1419
</Project>

‎tests/PagerControlPolyfill.NuGetTest/PagerControlPolyfill.NuGetTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
27-
<PackageReference Include="PagerControlPolyfill" Version="1.0.0" />
26+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
27+
<PackageReference Include="PagerControlPolyfill" Version="1.0.3" />
2828
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
2929
<Manifest Include="$(ApplicationManifest)" />
3030
</ItemGroup>

‎tests/PagerControlPolyfill.NuGetTest/Properties/PublishProfiles/win-arm64.pubxml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>ARM64</Platform>
8+
<Platform>arm64</Platform>
99
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win-arm64\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
1318
</PropertyGroup>
1419
</Project>

‎tests/PagerControlPolyfill.NuGetTest/Properties/PublishProfiles/win-x64.pubxml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x64</Platform>
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win-x64\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
1318
</PropertyGroup>
1419
</Project>

‎tests/PagerControlPolyfill.NuGetTest/Properties/PublishProfiles/win-x86.pubxml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>x86</Platform>
8+
<Platform>win-x86</Platform>
99
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win-x86\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>true</PublishSingleFile>
13+
<Configuration>Release</Configuration>
14+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
15+
<PublishReadyToRun>true</PublishReadyToRun>
16+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
17+
<WindowsPackageType>None</WindowsPackageType>
1318
</PropertyGroup>
1419
</Project>

0 commit comments

Comments
 (0)