mirror of
https://github.com/BeyondDimension/SteamTools.git
synced 2026-10-16 21:21:55 +08:00
🔖 TBD v3.1.10001.0
This commit is contained in:
LY
@@ -34,6 +34,7 @@ bld/
|
||||
|
||||
# Visual Studio 2015/2017 cache/options directory
|
||||
.vs/
|
||||
.vscode/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
|
||||
Vendored
-7
@@ -1,7 +0,0 @@
|
||||
{
|
||||
// 使用 IntelliSense 了解相关属性。
|
||||
// 悬停以查看现有属性的描述。
|
||||
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": []
|
||||
}
|
||||
@@ -116,7 +116,6 @@
|
||||
<Project Path="ref/dotnetCampus.Ipc/src/dotnetCampus.Ipc/dotnetCampus.Ipc.csproj" />
|
||||
</Folder>
|
||||
<Folder Name="/2.Reference/Steam/">
|
||||
<Project Path="ref/ArchiSteamFarm/ArchiSteamFarm/ArchiSteamFarm.csproj" />
|
||||
<Project Path="ref/Facepunch.Steamworks/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj" />
|
||||
<Project Path="ref/Facepunch.Steamworks/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj" />
|
||||
<Project Path="ref/Gameloop.Vdf/Gameloop.Vdf/Gameloop.Vdf.csproj" />
|
||||
|
||||
+1
-1
Submodule ref/Common updated: baf1832b2e...818b673aba
@@ -13,7 +13,9 @@ public static partial class AssemblyInfo
|
||||
/// </summary>
|
||||
public const string Version = $"{Version2}.{VersionBuild}";
|
||||
|
||||
const string VersionBuild = "1";
|
||||
const string VersionBuild = "1"; // 1~99
|
||||
|
||||
const string VersionBuild2 = $"{VersionBuild}0"; // VersionBuild为1位时，补0，两位
|
||||
|
||||
/// <summary>
|
||||
/// 预览版本号，范围 1~9，只增不减
|
||||
@@ -25,7 +27,7 @@ public static partial class AssemblyInfo
|
||||
/// </summary>
|
||||
const string ver_for_rc = "0";
|
||||
|
||||
public const string FileVersion = $"{Version2}.2{ver_for_rc}2{ver_for_preview}.0"; // msix 需要保持第四位为0
|
||||
public const string FileVersion = $"{Version2}.{VersionBuild2}{ver_for_rc}0{ver_for_preview}.0"; // msix 需要保持第四位为0
|
||||
|
||||
public const string InformationalVersion = Version;
|
||||
//public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
|
||||
@@ -65,6 +67,8 @@ public static partial class AssemblyInfo
|
||||
/// </summary>
|
||||
public const string Product = Trademark;
|
||||
|
||||
public const string Product_APP_REVERSE_PROXY = $"{Product} - Accelerator and script module sub-process";
|
||||
|
||||
/// <summary>
|
||||
/// 与该应用程序关联的公司名称。
|
||||
/// </summary>
|
||||
@@ -148,4 +152,37 @@ false
|
||||
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// 验证程序集是否为合法程序集
|
||||
/// </summary>
|
||||
/// <param name="assemblyPath"></param>
|
||||
/// <returns></returns>
|
||||
public static bool ValidateAssembly(string assemblyPath)
|
||||
{
|
||||
var fvi = FileVersionInfo.GetVersionInfo(assemblyPath);
|
||||
if (fvi.Comments != Description)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (fvi.CompanyName != Company)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (fvi.LegalCopyright != Copyright)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (fvi.LegalTrademarks != Trademark)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (fvi.ProductName != Product && fvi.ProductName != Product_APP_REVERSE_PROXY)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: Digital signature verification
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
+1
-1
@@ -27,7 +27,7 @@ using AssemblyInfo = BD.WTTS.AssemblyInfo;
|
||||
[assembly: AssemblyTrademark(AssemblyInfo.Trademark)]
|
||||
[assembly: AssemblyDescription(AssemblyInfo.Description)]
|
||||
#if APP_REVERSE_PROXY
|
||||
[assembly: AssemblyProduct($"{AssemblyInfo.Product} - Accelerator and script module sub-process")]
|
||||
[assembly: AssemblyProduct(AssemblyInfo.Product_APP_REVERSE_PROXY)]
|
||||
#else
|
||||
[assembly: AssemblyProduct(AssemblyInfo.Product)]
|
||||
#endif
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
<legacyCorruptedStateExceptionsPolicy enabled="true"/>
|
||||
</runtime>
|
||||
<appSettings>
|
||||
<add key="d" value="11.0.0"/>
|
||||
<add key="d" value="11.0.0-preview.7.26381.103"/>
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -10,6 +10,6 @@
|
||||
<legacyCorruptedStateExceptionsPolicy enabled="true"/>
|
||||
</runtime>
|
||||
<appSettings>
|
||||
<add key="d" value="11.0.0"/>
|
||||
<add key="d" value="11.0.0-preview.7.26381.103"/>
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#if NETFRAMEWORK
|
||||
using System.Configuration;
|
||||
using System.Diagnostics;
|
||||
#endif
|
||||
using static BD.WTTS.AssemblyInfo;
|
||||
using static BD.WTTS.Client.Resources.Strings;
|
||||
@@ -19,11 +20,12 @@ static unsafe partial class Program
|
||||
dotnet_version_major = "11";
|
||||
dotnet_version_minor = "0";
|
||||
dotnet_version_build = "0";
|
||||
dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
|
||||
dotnet_version_preOrRcString = "-preview.7.26381.103"; // -字符开头！
|
||||
dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}{dotnet_version_preOrRcString}";
|
||||
}
|
||||
|
||||
//#if NETFRAMEWORK
|
||||
public static string dotnet_version_major, dotnet_version_minor, dotnet_version_build, dotnet_version;
|
||||
public static string dotnet_version_major, dotnet_version_minor, dotnet_version_build, dotnet_version, dotnet_version_preOrRcString;
|
||||
//#else
|
||||
// public const string dotnet_version_major = "7";
|
||||
// public const string dotnet_version_minor = "0";
|
||||
@@ -239,7 +241,7 @@ static unsafe partial class Program
|
||||
#if NETFRAMEWORK
|
||||
try
|
||||
{
|
||||
var dotnet_version_ = ConfigurationManager.AppSettings["d"];
|
||||
var dotnet_version_ = ConfigurationManager.AppSettings["d"]; // 由 App.config 中的配置键控制加载运行时版本
|
||||
if (!
|
||||
#if !NET35
|
||||
string.
|
||||
@@ -248,7 +250,7 @@ static unsafe partial class Program
|
||||
dotnet_version_.Length < sbyte.MaxValue)
|
||||
{
|
||||
var dotnet_version__ = dotnet_version_.Split('.');
|
||||
int major, minor, build;
|
||||
int major, minor;
|
||||
switch (dotnet_version__.Length)
|
||||
{
|
||||
case 1:
|
||||
@@ -265,8 +267,17 @@ static unsafe partial class Program
|
||||
case 3:
|
||||
dotnet_version_major = (int.TryParse(dotnet_version__[0], out major) ? major : 0).ToString();
|
||||
dotnet_version_minor = (int.TryParse(dotnet_version__[1], out minor) ? minor : 0).ToString();
|
||||
dotnet_version_build = (int.TryParse(dotnet_version__[2], out build) ? build : 0).ToString();
|
||||
dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
|
||||
// 支持 PRE/RC 版本号
|
||||
string? preOrRcString = null;
|
||||
var buildString = dotnet_version__[2];
|
||||
var index = buildString.IndexOf('-');
|
||||
if (index > 0)
|
||||
{
|
||||
preOrRcString = buildString.Substring(index);
|
||||
buildString = buildString.Substring(0, index);
|
||||
}
|
||||
dotnet_version_build = (int.TryParse(buildString, out var build) ? build : 0).ToString();
|
||||
dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}{preOrRcString}";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,29 +64,43 @@ public sealed class IPCSubProcessServiceImpl : IPCSubProcessService
|
||||
|
||||
internal static bool CheckBePid(Process proc)
|
||||
{
|
||||
var procPath = Environment.ProcessPath;
|
||||
ArgumentNullException.ThrowIfNullOrWhiteSpace(procPath);
|
||||
procPath = Path.GetFullPath(procPath);
|
||||
|
||||
var fn = proc.TryGetMainModule()?.FileName;
|
||||
var fnPath = fn == null ? null : Path.GetFullPath(fn);
|
||||
|
||||
if (procPath == fnPath)
|
||||
if (proc.Id == Environment.ProcessId)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var accProPath = Path.GetFullPath(Path.Combine(procPath, "..", "modules", "Accelerator",
|
||||
var thisPath = Environment.ProcessPath;
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(thisPath);
|
||||
thisPath = Path.GetFullPath(thisPath);
|
||||
|
||||
var procPath = proc.TryGetMainModule()?.FileName;
|
||||
procPath = procPath == null ? null : Path.GetFullPath(procPath);
|
||||
|
||||
if (procPath != null)
|
||||
{
|
||||
|
||||
if (thisPath == procPath)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var accProPath = Path.GetFullPath(Path.Combine(thisPath, "..", "modules", "Accelerator",
|
||||
#if WINDOWS
|
||||
"Steam++.Accelerator.exe"
|
||||
"Steam++.Accelerator.exe"
|
||||
#else
|
||||
"Steam++.Accelerator"
|
||||
"Steam++.Accelerator"
|
||||
#endif
|
||||
|
||||
));
|
||||
if (procPath == accProPath)
|
||||
{
|
||||
return true;
|
||||
));
|
||||
if (procPath == accProPath)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (AssemblyInfo.ValidateAssembly(procPath))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -94,6 +108,10 @@ public sealed class IPCSubProcessServiceImpl : IPCSubProcessService
|
||||
|
||||
internal static bool CheckBePid(int pid)
|
||||
{
|
||||
if (pid == Environment.ProcessId)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (!TryGetProcessById(pid, out var proc))
|
||||
{
|
||||
return false;
|
||||
|
||||
+2
@@ -96,6 +96,8 @@
|
||||
<PackageReference Include="BD.Common.Repositories.SQLitePCL" />-->
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common.Repositories.SQLitePCL\BD.Common.Repositories.SQLitePCL.csproj" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common\BD.Common.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
<PackageReference Include="NLog" />
|
||||
<PackageReference Include="System.Linq.Async" />
|
||||
<PackageReference Include="Ae.DNS.Client" />
|
||||
|
||||
@@ -82,6 +82,8 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
+2
@@ -117,6 +117,8 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -70,6 +70,8 @@
|
||||
<ProjectReference Include="..\..\ref\WinAuth\src\WinAuth\WinAuth.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -81,6 +81,8 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -80,6 +80,8 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -76,6 +76,8 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
|
||||
<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc.Analyzers\dotnetCampus.Ipc.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\..\ref\dotnetCampus.Ipc\src\dotnetCampus.Ipc\dotnetCampus.Ipc.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -624,6 +624,27 @@ $"""
|
||||
/// <param name="architecture"></param>
|
||||
static void CopyRuntime(string rootPublishDir, Platform platform, bool isCopyRuntime, Architecture architecture)
|
||||
{
|
||||
string? preOrRcString = null;
|
||||
var infoVer = typeof(object).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
|
||||
if (!string.IsNullOrWhiteSpace(infoVer))
|
||||
{
|
||||
var index = infoVer.IndexOf('-');
|
||||
if (index > 4) // x.y.z-abc
|
||||
{
|
||||
var index2 = infoVer.IndexOf('+');
|
||||
if (index2 > 0)
|
||||
{
|
||||
preOrRcString = infoVer.Substring(index + 1, index2 - index - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
preOrRcString = infoVer[(index + 1)..];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var specific_version = $"{Environment.Version.Major}.{Environment.Version.Minor}.{Environment.Version.Build}{(preOrRcString == null ? null : $"-{preOrRcString}")}";
|
||||
|
||||
switch (platform)
|
||||
{
|
||||
case Platform.UWP:
|
||||
@@ -643,36 +664,36 @@ $"""
|
||||
Environment.SpecialFolder.ProgramFilesX86 :
|
||||
Environment.SpecialFolder.ProgramFiles);
|
||||
|
||||
static string get_hostfxr_path(string rootPath) => Path.Combine(rootPath,
|
||||
string get_hostfxr_path(string rootPath) => Path.Combine(rootPath,
|
||||
"dotnet",
|
||||
"host",
|
||||
"fxr",
|
||||
$"{Environment.Version.Major}.{Environment.Version.Minor}.{Environment.Version.Build}",
|
||||
specific_version,
|
||||
"hostfxr.dll");
|
||||
|
||||
var hostfxr_path = get_hostfxr_path(programFiles);
|
||||
|
||||
static string get_aspnetcore_path(string rootPath) => Path.Combine(rootPath,
|
||||
string get_aspnetcore_path(string rootPath) => Path.Combine(rootPath,
|
||||
"dotnet",
|
||||
"shared",
|
||||
"Microsoft.AspNetCore.App",
|
||||
$"{Environment.Version.Major}.{Environment.Version.Minor}.{Environment.Version.Build}");
|
||||
specific_version);
|
||||
|
||||
var aspnetcore_path = get_aspnetcore_path(programFiles);
|
||||
|
||||
static string get_win_desktop_path(string rootPath) => Path.Combine(rootPath,
|
||||
string get_win_desktop_path(string rootPath) => Path.Combine(rootPath,
|
||||
"dotnet",
|
||||
"shared",
|
||||
"Microsoft.WindowsDesktop.App",
|
||||
$"{Environment.Version.Major}.{Environment.Version.Minor}.{Environment.Version.Build}");
|
||||
specific_version);
|
||||
|
||||
var win_desktop_path = get_win_desktop_path(programFiles);
|
||||
|
||||
static string get_netcore_path(string rootPath) => Path.Combine(rootPath,
|
||||
string get_netcore_path(string rootPath) => Path.Combine(rootPath,
|
||||
"dotnet",
|
||||
"shared",
|
||||
"Microsoft.NETCore.App",
|
||||
$"{Environment.Version.Major}.{Environment.Version.Minor}.{Environment.Version.Build}");
|
||||
specific_version);
|
||||
|
||||
var netcore_path = get_netcore_path(programFiles);
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ interface Constants
|
||||
{
|
||||
const string ProjectDir_AvaloniaApp = "BD.WTTS.Client.Avalonia.App";
|
||||
const string ProjectDir_AppHost = "BD.WTTS.Client.AppHost";
|
||||
const string windowssdkver = "10.0.19041";
|
||||
const string windowssdkver = "10.0.19041.0";
|
||||
|
||||
static string DebugRuntimeConfigPath => Path.Combine(ProjectUtils.ProjPath, "src", ProjectDir_AvaloniaApp, "bin", "Debug", $"net{Environment.Version.Major}.{Environment.Version.Minor}-windows{windowssdkver}", runtimeconfigjsonfilename);
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ public sealed class IcoTest
|
||||
using var logo512Bitmap = SKBitmap.Decode(logo512Path);
|
||||
|
||||
logoBitmaps = new[] { logo512Bitmap }.Concat(new[] { 256, 128, 96, 64, 48, 32, 24, 16 }
|
||||
.Select(x => logo512Bitmap.Resize(new SKSizeI { Height = x, Width = x }, SKFilterQuality.High)))
|
||||
.Select(x => logo512Bitmap.Resize(new SKSizeI { Height = x, Width = x }, SKSamplingOptions.Default)))
|
||||
.ToArray(); // 根据 512 大小生成所有挡位的位图数组
|
||||
|
||||
var savePath = Path.Combine(assemblyDir, "EncodeTest.ico");
|
||||
@@ -79,7 +79,7 @@ public sealed class IcoTest
|
||||
var maxSize = allSize.Max();
|
||||
using var fBitmap = ResizeImage(imgBitmap, gameBitmap, maxSize);
|
||||
bitmaps = new[] { fBitmap }.Concat(allSize.Where(x => x != maxSize)
|
||||
.Select(x => fBitmap.Resize(new SKSizeI { Height = x, Width = x }, SKFilterQuality.High)))
|
||||
.Select(x => fBitmap.Resize(new SKSizeI { Height = x, Width = x }, SKSamplingOptions.Default)))
|
||||
.ToArray();
|
||||
|
||||
var savePath = Path.Combine(saveDirPath, $"{img.Name}.ico");
|
||||
@@ -106,7 +106,7 @@ public sealed class IcoTest
|
||||
int watermarkTop = size - icoHeight;
|
||||
|
||||
SKBitmap scaledImage = new(size, size);
|
||||
image.ScalePixels(scaledImage, SKFilterQuality.High);
|
||||
image.ScalePixels(scaledImage, SKSamplingOptions.Default);
|
||||
|
||||
using SKCanvas canvas = new(scaledImage);
|
||||
canvas.DrawBitmap(icoIcon, new SKRect(watermarkLeft, watermarkTop, watermarkLeft + icoWidth, watermarkTop + icoHeight));
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net$(DotNet_Version)-windows10.0.19041</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net$(DotNet_Version)-windows10.0.19041.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">net$(DotNet_Version)-macos</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net$(DotNet_Version)</TargetFrameworks>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">12.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net$(DotNet_Version)</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net$(DotNet_Version)-windows10.0.19041</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net$(DotNet_Version)-windows10.0.19041.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -2,14 +2,14 @@
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net$(DotNet_Version)</TargetFrameworks>
|
||||
<!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-android;net$(DotNet_Version)-ios;net$(DotNet_Version)-macos;net$(DotNet_Version)-maccatalyst;net$(DotNet_Version)-windows10.0.19041</TargetFrameworks>-->
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-macos;net$(DotNet_Version)-windows10.0.19041</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-macos;net$(DotNet_Version)-windows10.0.19041.0</TargetFrameworks>
|
||||
<!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net$(DotNet_Version)-android;net$(DotNet_Version)-ios;net$(DotNet_Version)-macos;net$(DotNet_Version)-maccatalyst</TargetFrameworks>-->
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net$(DotNet_Version)-ios;net$(DotNet_Version)-macos;net$(DotNet_Version)-maccatalyst</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks)</TargetFrameworks>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">12.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">12.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net$(DotNet_Version)</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-windows10.0.19041</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-windows10.0.19041.0</TargetFrameworks>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">12.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
|
||||
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ public static partial class ProjectUtils
|
||||
/// </summary>
|
||||
public const string tfm_ =
|
||||
#if WINDOWS
|
||||
"-windows10.0.19041";
|
||||
"-windows10.0.19041.0";
|
||||
#elif LINUX
|
||||
"";
|
||||
#elif MACCATALYST
|
||||
|
||||
Reference in New Issue
Block a user