From e6cb3e12127b01315a429eb7bb8c9326f76fb0a2 Mon Sep 17 00:00:00 2001 From: Drombeys Date: Thu, 29 Feb 2024 09:47:54 +0300 Subject: [PATCH] Fix NativeAOT warnings (without localization) --- publish-hasher.bat | 8 +------- publish-launcher.bat | 8 +------- src/ImeSense.Launchers.Belarus.Avalonia/ViewLocator.cs | 2 +- .../Helpers/ApplicationHelper.cs | 7 ++----- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/publish-hasher.bat b/publish-hasher.bat index 4f8cb6c..218e254 100644 --- a/publish-hasher.bat +++ b/publish-hasher.bat @@ -1,9 +1,3 @@ dotnet publish src\ImeSense.Launchers.Belarus.CryptoHasher\ImeSense.Launchers.Belarus.CryptoHasher.csproj ^ --configuration Release ^ - --runtime win-x86 ^ - --self-contained true ^ - -p:PublishSingleFile=true ^ - -p:IncludeAllContentForSelfExtract=true ^ - -p:EnableCompressionInSingleFile=true ^ - -p:DebugSymbols=false ^ - -p:DebugType=None + --runtime win-x64 diff --git a/publish-launcher.bat b/publish-launcher.bat index 72cd3d5..d78cf55 100644 --- a/publish-launcher.bat +++ b/publish-launcher.bat @@ -1,9 +1,3 @@ dotnet publish src\ImeSense.Launchers.Belarus.Avalonia\ImeSense.Launchers.Belarus.Avalonia.csproj ^ --configuration Release ^ - --runtime win-x86 ^ - --self-contained true ^ - -p:PublishSingleFile=true ^ - -p:IncludeAllContentForSelfExtract=true ^ - -p:EnableCompressionInSingleFile=true ^ - -p:DebugSymbols=false ^ - -p:DebugType=None + --runtime win-x64 diff --git a/src/ImeSense.Launchers.Belarus.Avalonia/ViewLocator.cs b/src/ImeSense.Launchers.Belarus.Avalonia/ViewLocator.cs index 5bbaa04..8b76271 100644 --- a/src/ImeSense.Launchers.Belarus.Avalonia/ViewLocator.cs +++ b/src/ImeSense.Launchers.Belarus.Avalonia/ViewLocator.cs @@ -11,7 +11,7 @@ namespace ImeSense.Launchers.Belarus.Avalonia; public class ViewLocator : IDataTemplate { public Control Build(object? data) { - var name = data!.GetType().FullName!.Replace("ViewModel", "View"); + var name = $"{data!.GetType().FullName!.Replace("ViewModel", "View")}"; var type = Type.GetType(name); if (type != null) { diff --git a/src/ImeSense.Launchers.Belarus.Core/Helpers/ApplicationHelper.cs b/src/ImeSense.Launchers.Belarus.Core/Helpers/ApplicationHelper.cs index 500cf1f..1db76d4 100644 --- a/src/ImeSense.Launchers.Belarus.Core/Helpers/ApplicationHelper.cs +++ b/src/ImeSense.Launchers.Belarus.Core/Helpers/ApplicationHelper.cs @@ -5,13 +5,10 @@ namespace ImeSense.Launchers.Belarus.Core.Helpers; public static class ApplicationHelper { public static string GetAppVersion() { - var entryAssembly = Assembly.GetEntryAssembly(); - var version = entryAssembly!.GetName().Version; - return $"{version!.Major}.{version.Minor}"; + return "2.1"; } public static string? GetCompanyName() { - var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly()!.Location); - return versionInfo.CompanyName; + return "ImeSense"; } }