Skip to content

Commit 0ac2938

Browse files
committed
fix: vscode 项目加载
1 parent 51a3193 commit 0ac2938

7 files changed

Lines changed: 13 additions & 8 deletions

File tree

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"dotnet.defaultSolution": "Sitreamai.sln",
2+
"dotnet.defaultSolution": "Sitreamai.slnx",
33
"workbench.colorCustomizations": {
44
"activityBar.activeBackground": "#f9c3d9",
55
"activityBar.background": "#f9c3d9",
@@ -38,4 +38,4 @@
3838
"group": "Default"
3939
}
4040
]
41-
}
41+
}

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<Project>
2+
<PropertyGroup>
3+
<!-- Linux 上的设计时构建通常使用 Debug,不能依赖 Linux* 配置名才能拿到正确的框架引用。 -->
4+
<IsLinuxBuild Condition="$(Configuration.StartsWith('Linux')) or $([MSBuild]::IsOSPlatform('Linux'))">true</IsLinuxBuild>
5+
</PropertyGroup>
6+
27
<!-- 仅在 Windows 上构建时,让随 MaiChartManager 一起发布的 MuConvert 为自包含 win-x64,
38
使打包进 Windows 版的 MuConvert.exe 可独立运行(不依赖单独的 dotnet 运行时)。
49
Linux 原生构建则不强制,MuConvert 随主项目按 linux-x64 框架依赖构建。

MaiChartManager.CLI/MaiChartManager.CLI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<IsLinuxBuild Condition="$(Configuration.StartsWith('Linux'))">true</IsLinuxBuild>
54
<OutputType>Exe</OutputType>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>

MaiChartManager.GenClient/MaiChartManager.GenClient.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.Web">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
4+
<TargetFramework Condition="'$(IsLinuxBuild)' != 'true'">net10.0-windows10.0.17763.0</TargetFramework>
5+
<TargetFramework Condition="'$(IsLinuxBuild)' == 'true'">net10.0</TargetFramework>
56
<Nullable>enable</Nullable>
67
<ImplicitUsings>enable</ImplicitUsings>
78
<InvariantGlobalization>false</InvariantGlobalization>
8-
<UseWindowsForms>true</UseWindowsForms>
9+
<UseWindowsForms Condition="'$(IsLinuxBuild)' != 'true'">true</UseWindowsForms>
910
<IsPublishable>False</IsPublishable>
1011
<IsTransformWebConfigDisabled>True</IsTransformWebConfigDisabled>
1112
<ValidateExecutableReferencesMatchSelfContained>False</ValidateExecutableReferencesMatchSelfContained>

MaiChartManager.Tests/MaiChartManager.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<IsLinuxBuild Condition="$(Configuration.StartsWith('Linux'))">true</IsLinuxBuild>
43
<TargetFramework Condition="'$(IsLinuxBuild)' != 'true'">net10.0-windows10.0.17763.0</TargetFramework>
54
<TargetFramework Condition="'$(IsLinuxBuild)' == 'true'">net10.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>

MaiChartManager/MaiChartManager.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<IsLinuxBuild Condition="$(Configuration.StartsWith('Linux'))">true</IsLinuxBuild>
43
<Nullable>enable</Nullable>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<InvariantGlobalization>false</InvariantGlobalization>
@@ -206,4 +205,4 @@
206205
<DependentUpon>Locale.resx</DependentUpon>
207206
</EmbeddedResource>
208207
</ItemGroup>
209-
</Project>
208+
</Project>

Sitreamai.slnx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<Configurations>
33
<BuildType Name="Crack" />
44
<BuildType Name="Debug" />
5+
<BuildType Name="LinuxDebug" />
6+
<BuildType Name="LinuxRelease" />
57
<BuildType Name="Release" />
68
</Configurations>
79
<Project Path="MaiChartManager/MaiChartManager.csproj" />

0 commit comments

Comments
 (0)