From aa42ee47a3613fe792b96f6684091cb8c2a7915d Mon Sep 17 00:00:00 2001 From: Guerra24 Date: Sun, 10 Nov 2024 18:23:50 -0600 Subject: [PATCH] Net native strikes again --- .../LRReader.Avalonia.Desktop.csproj | 2 +- LRReader.Avalonia/LRReader.Avalonia.csproj | 2 +- LRReader.Shared/LRReader.Shared.csproj | 2 +- LRReader.UWP/LRReader.UWP.csproj | 52 +------- LRReader.UWP/Properties/Default.rd.xml | 2 + LRReader.sln | 112 ++++-------------- 6 files changed, 29 insertions(+), 143 deletions(-) diff --git a/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj b/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj index 0d18faa..7239e7e 100644 --- a/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj +++ b/LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj @@ -6,7 +6,7 @@ logo.ico true copyused - x64;ARM64 + AnyCPU diff --git a/LRReader.Avalonia/LRReader.Avalonia.csproj b/LRReader.Avalonia/LRReader.Avalonia.csproj index 590fa24..180ccc4 100644 --- a/LRReader.Avalonia/LRReader.Avalonia.csproj +++ b/LRReader.Avalonia/LRReader.Avalonia.csproj @@ -2,7 +2,7 @@ net6.0 enable - x64;ARM64 + AnyCPU diff --git a/LRReader.Shared/LRReader.Shared.csproj b/LRReader.Shared/LRReader.Shared.csproj index 231f3c9..5b0d106 100644 --- a/LRReader.Shared/LRReader.Shared.csproj +++ b/LRReader.Shared/LRReader.Shared.csproj @@ -8,7 +8,7 @@ 6.2.14 10.0.22621.0 10.0.17763.0 - x64;ARM64 + AnyCPU diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj index d12fc04..7c16e3e 100644 --- a/LRReader.UWP/LRReader.UWP.csproj +++ b/LRReader.UWP/LRReader.UWP.csproj @@ -33,54 +33,6 @@ 11.0 true - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008;CS8305 - full - ARM - false - prompt - true - 1501 - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008;CS8305 - pdbonly - ARM - false - prompt - true - true - 1501 - true bin\ARM64\Debug\ @@ -98,7 +50,7 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8305 + ;2008;CS8305;MCG0007 pdbonly ARM64 false @@ -123,7 +75,7 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8305 + ;2008;CS8305;MCG0007 pdbonly x64 false diff --git a/LRReader.UWP/Properties/Default.rd.xml b/LRReader.UWP/Properties/Default.rd.xml index 3af61cd..86e172f 100644 --- a/LRReader.UWP/Properties/Default.rd.xml +++ b/LRReader.UWP/Properties/Default.rd.xml @@ -27,6 +27,8 @@ + + diff --git a/LRReader.sln b/LRReader.sln index 7242163..20f330a 100644 --- a/LRReader.sln +++ b/LRReader.sln @@ -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