Skip to content

Commit

Permalink
Net native strikes again
Browse files Browse the repository at this point in the history
  • Loading branch information
Guerra24 committed Nov 11, 2024
1 parent 227e150 commit aa42ee4
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 143 deletions.
2 changes: 1 addition & 1 deletion LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ApplicationIcon>logo.ico</ApplicationIcon>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<TrimMode>copyused</TrimMode>
<Platforms>x64;ARM64</Platforms>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<Content Include="logo.ico" />
Expand Down
2 changes: 1 addition & 1 deletion LRReader.Avalonia/LRReader.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Platforms>x64;ARM64</Platforms>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aura.UI" Version="0.1.4.2" />
Expand Down
2 changes: 1 addition & 1 deletion LRReader.Shared/LRReader.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ExtrasUwpMetaPackageVersion>6.2.14</ExtrasUwpMetaPackageVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<Platforms>x64;ARM64</Platforms>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>

<ItemGroup>
Expand Down
52 changes: 2 additions & 50 deletions LRReader.UWP/LRReader.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,54 +33,6 @@
<LangVersion>11.0</LangVersion>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008;CS8305</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<SuppressXamlWarnings>1501</SuppressXamlWarnings>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008;CS8305</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
<SuppressXamlWarnings>1501</SuppressXamlWarnings>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
Expand All @@ -98,7 +50,7 @@
<OutputPath>bin\ARM64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008;CS8305</NoWarn>
<NoWarn>;2008;CS8305;MCG0007</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -123,7 +75,7 @@
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008;CS8305</NoWarn>
<NoWarn>;2008;CS8305;MCG0007</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand Down
2 changes: 2 additions & 0 deletions LRReader.UWP/Properties/Default.rd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<Subtypes Activate="Required Public" />
</Type>

<Type Name="System.Nullable{Windows.UI.Xaml.Visibility}" MarshalObject="Required All" />

<!-- Add your application specific runtime directives here. -->
<Namespace Name="Microsoft.Extensions.Options" Dynamic="Required All" />
<Namespace Name="Microsoft.Extensions.Logging" Dynamic="Required All" />
Expand Down
112 changes: 22 additions & 90 deletions LRReader.sln
Original file line number Diff line number Diff line change
Expand Up @@ -20,124 +20,56 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LRReader.Avalonia.Desktop",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM.Build.0 = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM64.Build.0 = Debug|ARM64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x64.ActiveCfg = Debug|x64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x64.Build.0 = Debug|x64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x86.ActiveCfg = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x86.Build.0 = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|Any CPU.Build.0 = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM.ActiveCfg = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM.Build.0 = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM64.ActiveCfg = Release|ARM64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM64.Build.0 = Release|ARM64
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|ARM64.Build.0 = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x64.ActiveCfg = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Debug|x64.Build.0 = Debug|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM64.ActiveCfg = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|ARM64.Build.0 = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|x64.ActiveCfg = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|x64.Build.0 = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|x86.ActiveCfg = Release|Any CPU
{CB0AF1C0-A296-4E1D-85B9-A564868B7C0E}.Release|x86.Build.0 = Release|Any CPU
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|Any CPU.ActiveCfg = Debug|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM.ActiveCfg = Debug|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM.Build.0 = Debug|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM.Deploy.0 = Debug|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM64.ActiveCfg = Debug|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM64.Build.0 = Debug|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|ARM64.Deploy.0 = Debug|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x64.ActiveCfg = Debug|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x64.Build.0 = Debug|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x64.Deploy.0 = Debug|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x86.ActiveCfg = Debug|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x86.Build.0 = Debug|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Debug|x86.Deploy.0 = Debug|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|Any CPU.ActiveCfg = Release|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM.ActiveCfg = Release|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM.Build.0 = Release|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM.Deploy.0 = Release|ARM
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM64.ActiveCfg = Release|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM64.Build.0 = Release|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|ARM64.Deploy.0 = Release|ARM64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x64.ActiveCfg = Release|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x64.Build.0 = Release|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x64.Deploy.0 = Release|x64
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x86.ActiveCfg = Release|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x86.Build.0 = Release|x86
{29C83437-DE8D-4B9B-BE53-8262F9B59D50}.Release|x86.Deploy.0 = Release|x86
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM.ActiveCfg = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM.Build.0 = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM64.ActiveCfg = Debug|ARM64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM64.Build.0 = Debug|ARM64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x64.ActiveCfg = Debug|x64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x64.Build.0 = Debug|x64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x86.ActiveCfg = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x86.Build.0 = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|Any CPU.Build.0 = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM.ActiveCfg = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM.Build.0 = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM64.ActiveCfg = Release|ARM64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM64.Build.0 = Release|ARM64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x64.ActiveCfg = Release|x64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x64.Build.0 = Release|x64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x86.ActiveCfg = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x86.Build.0 = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|ARM.ActiveCfg = Debug|x64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|ARM.Build.0 = Debug|x64
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|ARM64.Build.0 = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x64.ActiveCfg = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Debug|x64.Build.0 = Debug|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM64.ActiveCfg = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|ARM64.Build.0 = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x64.ActiveCfg = Release|Any CPU
{B67CC0CC-F705-4628-9DBF-C7F96A53F198}.Release|x64.Build.0 = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|ARM64.ActiveCfg = Debug|ARM64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|ARM64.Build.0 = Debug|ARM64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|x64.ActiveCfg = Debug|x64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|x64.Build.0 = Debug|x64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|x86.ActiveCfg = Debug|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Debug|x86.Build.0 = Debug|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|Any CPU.Build.0 = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|ARM.ActiveCfg = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|ARM.Build.0 = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|ARM64.ActiveCfg = Release|ARM64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|ARM64.Build.0 = Release|ARM64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|x64.ActiveCfg = Release|x64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|x64.Build.0 = Release|x64
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|x86.ActiveCfg = Release|Any CPU
{DEDB38AC-6E51-40B8-A419-E8136C525837}.Release|x86.Build.0 = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM.Build.0 = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM64.ActiveCfg = Debug|ARM64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM64.Build.0 = Debug|ARM64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x64.ActiveCfg = Debug|x64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x64.Build.0 = Debug|x64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x86.ActiveCfg = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x86.Build.0 = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|Any CPU.Build.0 = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM.ActiveCfg = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM.Build.0 = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM64.ActiveCfg = Release|ARM64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM64.Build.0 = Release|ARM64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x64.ActiveCfg = Release|x64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x64.Build.0 = Release|x64
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x86.ActiveCfg = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x86.Build.0 = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|ARM64.Build.0 = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x64.ActiveCfg = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Debug|x64.Build.0 = Debug|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM64.ActiveCfg = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|ARM64.Build.0 = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x64.ActiveCfg = Release|Any CPU
{518346D5-128B-4761-B7B5-F31AA39FC63D}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit aa42ee4

Please sign in to comment.