XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet
公开
关注 0 Fork 0 Star 0
返回提交历史

SpaceEngineersModDev/SpaceEngineersBlueprintEditorInWinUI

升级依赖包与目标框架，统一Acrylic资源引用

- 多项目目标框架从 net8.0 升级至 net10.0（含 net10.0-windows），并同步更新相关依赖包至新版本 - 移除 App.xaml 对 Materials.xaml 的合并引用，删除 Materials.xaml 文件 - 全面将 {ThemeResource AppAcrylicInAppBrush} 替换为 {ThemeResource AcrylicInAppFillColorDefaultBrush} - BackgroundImageService 的 AcrylicBrush 配置调整为完全透明 - 精简项目文件中的 MSBuild Target 节点格式 - 适配新版 .NET/WinUI 平台，提升依赖安全性与兼容性，统一 UI 资源引用，去除自定义 Acrylic 资源

6537347
XFE工作室室长 <mail@xfegzs.com>
提交于
父提交 843a21e

代码差异

11 个文件 +35 -76
Modified SpaceEngineersBlueprintEditor.BlueprintConverter/SpaceEngineersBlueprintEditor.BlueprintConverter.csproj +1 -1
@@ -12,7 +12,7 @@
12 12 </PropertyGroup>
13 13
14 14 <ItemGroup>
15 <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15 <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
16 16 </ItemGroup>
17 17
18 18 <ItemGroup>
Modified SpaceEngineersBlueprintEditor.GameAssemblyLoader/SpaceEngineersBlueprintEditor.GameAssemblyLoader.csproj +1 -1
@@ -1,7 +1,7 @@
1 1 <Project Sdk="Microsoft.NET.Sdk">
2 2
3 3 <PropertyGroup>
4 <TargetFrameworks>net48;net8.0</TargetFrameworks>
4 <TargetFrameworks>net48;net10.0</TargetFrameworks>
5 5 <LangVersion>latest</LangVersion>
6 6 <ImplicitUsings>disable</ImplicitUsings>
7 7 <Nullable>enable</Nullable>
Modified SpaceEngineersBlueprintEditor.Installer/SpaceEngineersBlueprintEditor.Installer.csproj +3 -3
@@ -2,7 +2,7 @@
2 2
3 3 <PropertyGroup>
4 4 <OutputType>WinExe</OutputType>
5 <TargetFramework>net8.0-windows</TargetFramework>
5 <TargetFramework>net10.0-windows</TargetFramework>
6 6 <Nullable>enable</Nullable>
7 7 <ImplicitUsings>enable</ImplicitUsings>
8 8 <UseWPF>true</UseWPF>
@@ -48,9 +48,9 @@
48 48 </ItemGroup>
49 49
50 50 <ItemGroup>
51 <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
51 <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
52 52 <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
53 <PackageReference Include="XFEExtension.NetCore" Version="3.3.2" />
53 <PackageReference Include="XFEExtension.NetCore" Version="5.2.0" />
54 54 <PackageReference Include="XFEExtension.NetCore.InputSimulator" Version="2.3.0" />
55 55 </ItemGroup>
56 56
Modified SpaceEngineersBlueprintEditor.SpaceEngineersCore/SpaceEngineersBlueprintEditor.SpaceEngineersCore.csproj +2 -2
@@ -11,8 +11,8 @@
11 11 </PropertyGroup>
12 12
13 13 <ItemGroup>
14 <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
15 <PackageReference Include="System.Management" Version="10.0.1" />
14 <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.11" />
15 <PackageReference Include="System.Management" Version="10.0.11" />
16 16 </ItemGroup>
17 17
18 18 </Project>
Modified SpaceEngineersBlueprintEditor.Test/SpaceEngineersBlueprintEditor.Test.csproj +5 -5
@@ -2,17 +2,17 @@
2 2
3 3 <PropertyGroup>
4 4 <OutputType>Exe</OutputType>
5 <TargetFramework>net8.0</TargetFramework>
5 <TargetFramework>net10.0</TargetFramework>
6 6 <ImplicitUsings>enable</ImplicitUsings>
7 7 <Nullable>enable</Nullable>
8 8 <UseSpaceEngineersAssemblies>true</UseSpaceEngineersAssemblies>
9 9 </PropertyGroup>
10 10
11 11 <ItemGroup>
12 <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
13 <PackageReference Include="XFEExtension.NetCore" Version="3.2.0" />
14 <PackageReference Include="XFEExtension.NetCore.XUnit" Version="2.0.4" />
15 <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
12 <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
13 <PackageReference Include="XFEExtension.NetCore" Version="5.2.0" />
14 <PackageReference Include="XFEExtension.NetCore.XUnit" Version="4.0.1" />
15 <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.11" />
16 16 </ItemGroup>
17 17
18 18 <ItemGroup>
Modified SpaceEngineersBlueprintEditor/App.xaml +0 -1
@@ -11,7 +11,6 @@
11 11 <!-- Other merged dictionaries here -->
12 12 <ResourceDictionary Source="/Styles/Thickness.xaml" />
13 13 <ResourceDictionary Source="/Styles/Controls.xaml" />
14 <ResourceDictionary Source="/Styles/Materials.xaml" />
15 14 </ResourceDictionary.MergedDictionaries>
16 15 <!-- Other app resources here -->
17 16 </ResourceDictionary>
Modified SpaceEngineersBlueprintEditor/Implements/Services/BackgroundImageService.cs +2 -4
@@ -39,10 +39,8 @@ class BackgroundImageService : GlobalServiceBase, IBackgroundImageService
39 39 if (_grid is not null)
40 40 _grid.Background = new AcrylicBrush
41 41 {
42 TintColor = ColorHelper.FromArgb(255, 24, 24, 24),
43 TintOpacity = 0.48,
44 TintLuminosityOpacity = 0.35,
45 FallbackColor = ColorHelper.FromArgb(255, 32, 32, 32)
42 TintLuminosityOpacity = 0,
43 TintColor = Colors.Transparent
46 44 };
47 45 }
48 46 }
Modified SpaceEngineersBlueprintEditor/SpaceEngineersBlueprintEditor.csproj +16 -23
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
1 <Project Sdk="Microsoft.NET.Sdk">
2 2 <PropertyGroup>
3 3 <OutputType>WinExe</OutputType>
4 <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
4 <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
5 5 <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
6 6 <RootNamespace>SpaceEngineersBlueprintEditor</RootNamespace>
7 7 <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -75,19 +75,19 @@
75 75 <ProjectCapability Include="Msix" />
76 76 </ItemGroup>
77 77 <ItemGroup>
78 <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
78 <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
79 79 <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
80 <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1-RTM" />
81 <PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
82 <PackageReference Include="Newtonsoft.Json" Version="13.0.5-beta1" />
83 <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
84 <PackageReference Include="WinUIEx" Version="2.9.0" />
85 <PackageReference Include="XFEExtension.NetCore" Version="3.3.*" />
86 <PackageReference Include="XFEExtension.NetCore.AutoConfig" Version="2.0.7" />
87 <PackageReference Include="XFEExtension.NetCore.AutoPath" Version="1.0.1" />
80 <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.2526" />
81 <PackageReference Include="Microsoft.WindowsAppSDK" Version="2.4.0" />
82 <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
83 <PackageReference Include="System.Drawing.Common" Version="10.0.11" />
84 <PackageReference Include="WinUIEx" Version="2.9.3" />
85 <PackageReference Include="XFEExtension.NetCore" Version="5.2.0" />
86 <PackageReference Include="XFEExtension.NetCore.AutoConfig" Version="3.0.1" />
87 <PackageReference Include="XFEExtension.NetCore.AutoPath" Version="2.0.0" />
88 88 <PackageReference Include="XFEExtension.NetCore.TodoHighLight" Version="1.0.0" />
89 <PackageReference Include="XFEExtension.NetCore.UpgradeHelper" Version="1.0.1" />
90 <PackageReference Include="XFEExtension.NetCore.WinUIHelper" Version="1.2.*" />
89 <PackageReference Include="XFEExtension.NetCore.UpgradeHelper" Version="2.0.0" />
90 <PackageReference Include="XFEExtension.NetCore.WinUIHelper" Version="2.0.1" />
91 91 </ItemGroup>
92 92 <ItemGroup>
93 93 <Page Update="Views\BlueprintEditPage.xaml">
@@ -122,26 +122,19 @@
122 122 <ProjectReference Include="..\SpaceEngineersBlueprintEditor.SpaceEngineersCore\SpaceEngineersBlueprintEditor.SpaceEngineersCore.csproj" />
123 123 </ItemGroup>
124 124 <Target Name="BuildBlueprintConverter" BeforeTargets="Build">
125 <MSBuild Projects="..\SpaceEngineersBlueprintEditor.BlueprintConverter\SpaceEngineersBlueprintEditor.BlueprintConverter.csproj"
126 Targets="Build"
127 Properties="Configuration=$(Configuration)"
128 RemoveProperties="Platform;RuntimeIdentifier;TargetFramework;TargetFrameworks" />
125 <MSBuild Projects="..\SpaceEngineersBlueprintEditor.BlueprintConverter\SpaceEngineersBlueprintEditor.BlueprintConverter.csproj" Targets="Build" Properties="Configuration=$(Configuration)" RemoveProperties="Platform;RuntimeIdentifier;TargetFramework;TargetFrameworks" />
129 126 </Target>
130 127 <Target Name="CopyBlueprintConverterToOutput" AfterTargets="Build">
131 128 <ItemGroup>
132 129 <_BlueprintConverterFile Include="..\SpaceEngineersBlueprintEditor.BlueprintConverter\bin\$(Configuration)\net48\**\*.*" />
133 130 </ItemGroup>
134 <Copy SourceFiles="@(_BlueprintConverterFile)"
135 DestinationFiles="@(_BlueprintConverterFile->'$(OutDir)Converter\%(RecursiveDir)%(Filename)%(Extension)')"
136 SkipUnchangedFiles="true" />
131 <Copy SourceFiles="@(_BlueprintConverterFile)" DestinationFiles="@(_BlueprintConverterFile->'$(OutDir)Converter\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
137 132 </Target>
138 133 <Target Name="CopyBlueprintConverterToPublish" AfterTargets="Publish">
139 134 <ItemGroup>
140 135 <_BlueprintConverterPublishFile Include="..\SpaceEngineersBlueprintEditor.BlueprintConverter\bin\$(Configuration)\net48\**\*.*" />
141 136 </ItemGroup>
142 <Copy SourceFiles="@(_BlueprintConverterPublishFile)"
143 DestinationFiles="@(_BlueprintConverterPublishFile->'$(PublishDir)Converter\%(RecursiveDir)%(Filename)%(Extension)')"
144 SkipUnchangedFiles="true" />
137 <Copy SourceFiles="@(_BlueprintConverterPublishFile)" DestinationFiles="@(_BlueprintConverterPublishFile->'$(PublishDir)Converter\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
145 138 </Target>
146 139 <ItemGroup>
147 140 <Page Update="Controls\CubeDeformationEditor.xaml">
Deleted SpaceEngineersBlueprintEditor/Styles/Materials.xaml +0 -31
@@ -1,31 +0,0 @@
1 <?xml version="1.0" encoding="utf-8"?>
2 <ResourceDictionary
3 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
5
6 <ResourceDictionary.ThemeDictionaries>
7 <ResourceDictionary x:Key="Default">
8 <AcrylicBrush
9 x:Key="AppAcrylicInAppBrush"
10 TintColor="#FF202020"
11 TintOpacity="0.68"
12 TintLuminosityOpacity="0.45"
13 FallbackColor="#FF202020"/>
14 </ResourceDictionary>
15
16 <ResourceDictionary x:Key="Light">
17 <AcrylicBrush
18 x:Key="AppAcrylicInAppBrush"
19 TintColor="#FFF3F3F3"
20 TintOpacity="0.72"
21 TintLuminosityOpacity="0.85"
22 FallbackColor="#FFF3F3F3"/>
23 </ResourceDictionary>
24
25 <ResourceDictionary x:Key="HighContrast">
26 <SolidColorBrush
27 x:Key="AppAcrylicInAppBrush"
28 Color="{ThemeResource SystemColorWindowColor}"/>
29 </ResourceDictionary>
30 </ResourceDictionary.ThemeDictionaries>
31 </ResourceDictionary>
Modified SpaceEngineersBlueprintEditor/Views/BlueprintsViewPage.xaml +4 -4
@@ -33,13 +33,13 @@
33 33 <GridView.ItemTemplate>
34 34 <DataTemplate x:DataType="model:BlueprintInfoViewData">
35 35 <Grid Width="280" ToolTipService.ToolTip="{x:Bind Name}" IsRightTapEnabled="True" RightTapped="Grid_RightTapped">
36 <Rectangle Opacity="0.5" Fill="{ThemeResource AppAcrylicInAppBrush}"/>
36 <Rectangle Opacity="0.5" Fill="{ThemeResource AcrylicInAppFillColorDefaultBrush}"/>
37 37 <Image x:Name="connectedElement" Grid.RowSpan="2" Source="{x:Bind BlueprintImage, FallbackValue='/Assets/Images/BlueprintDrag.png'}" Stretch="Uniform" VerticalAlignment="Top"/>
38 <StackPanel Visibility="{x:Bind NoBlueprint}" Opacity="0.5" Background="{ThemeResource AppAcrylicInAppBrush}">
38 <StackPanel Visibility="{x:Bind NoBlueprint}" Opacity="0.5" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}">
39 39 <Image Source="/Assets/Images/forbidden.svg" Width="80" Height="80"/>
40 40 <TextBlock x:Uid="BlueprintViewPage_NoBlueprint" Style="{ThemeResource TitleTextBlockStyle}" HorizontalAlignment="Center"/>
41 41 </StackPanel>
42 <Grid Height="38" ColumnSpacing="5" Padding="5,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="{ThemeResource AppAcrylicInAppBrush}">
42 <Grid Height="38" ColumnSpacing="5" Padding="5,0,5,0" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}">
43 43 <Grid.ColumnDefinitions>
44 44 <ColumnDefinition/>
45 45 <ColumnDefinition Width="Auto"/>
@@ -51,7 +51,7 @@
51 51 </DataTemplate>
52 52 </GridView.ItemTemplate>
53 53 </GridView>
54 <Grid Margin="0,0,0,20" Padding="5" CornerRadius="8" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{ThemeResource AppAcrylicInAppBrush}">
54 <Grid Margin="0,0,0,20" Padding="5" CornerRadius="8" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}">
55 55 <StackPanel Orientation="Horizontal" Spacing="10">
56 56 <AutoSuggestBox x:Uid="BlueprintViewPage_AutoSuggestBox_Blueprints" Width="250" QueryIcon="Find" Text="{x:Bind ViewModel.SearchText,Mode=TwoWay}"/>
57 57 <Button Grid.Column="1" Command="{x:Bind ViewModel.RefreshBlueprintsCommand}">
Modified SpaceEngineersBlueprintEditor/Views/GameDefinitionsViewPage.xaml +1 -1
@@ -39,7 +39,7 @@
39 39 </ScrollView>
40 40 </Grid>
41 41 </Grid>
42 <Grid Margin="0,0,0,20" Width="250" Padding="5" CornerRadius="8" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{ThemeResource AppAcrylicInAppBrush}">
42 <Grid Margin="0,0,0,20" Width="250" Padding="5" CornerRadius="8" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}">
43 43 <AutoSuggestBox x:Uid="GameDefinitionsViewPage_AutoSuggestBox_Definitions" QueryIcon="Find" Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}"/>
44 44 </Grid>
45 45 </Grid>