Skip to content

Commit dfe6285

Browse files
GpointChenGpointChen
committed
Merge upstream changes and resolve conflicts
2 parents 781c209 + ac73d04 commit dfe6285

File tree

268 files changed

+607
-20297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+607
-20297
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,25 @@ jobs:
88
runs-on: windows-2019
99
steps:
1010
- uses: actions/checkout@v2
11+
- name: Setup .NET
12+
uses: actions/setup-dotnet@v1
1113
with:
12-
submodules: recursive
13-
14+
dotnet-version: '7.x.x'
1415
- name: Define Version
1516
id: define-version
1617
run: |
1718
$env:COMMIT = $env:GITHUB_SHA.Substring(0, 7)
1819
echo "::set-output name=commit::$env:COMMIT"
19-
20-
- uses: nuget/setup-nuget@v1
21-
with:
22-
nuget-version: latest
23-
24-
- name: Restore Nuget Packages
25-
run: nuget restore SaintCoinach.sln
26-
27-
- name: Build DotNet4
28-
run: |
29-
cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
30-
.\MSBuild.exe $Env:GITHUB_WORKSPACE\SaintCoinach.sln /t:Build /p:Configuration=Release
31-
20+
- name: Restore dependencies
21+
run: dotnet restore
22+
- name: Build
23+
run: dotnet build -c Release
3224
- name: Create Release ZIPs
3325
if: ${{ github.ref == 'refs/heads/master' }}
3426
run: |
3527
mkdir release-out
36-
Compress-Archive -Path .\Godbert\bin\Release\* -DestinationPath .\release-out\Godbert.zip -Force
37-
Compress-Archive -Path .\SaintCoinach.Cmd\bin\Release\* -DestinationPath .\release-out\SaintCoinach.Cmd.zip -Force
28+
Compress-Archive -Path .\Godbert\bin\Release\net7.0-windows\* -DestinationPath .\release-out\Godbert.zip -Force
29+
Compress-Archive -Path .\SaintCoinach.Cmd\bin\Release\net7.0\* -DestinationPath .\release-out\SaintCoinach.Cmd.zip -Force
3830
3931
- name: Create Release
4032
uses: softprops/action-gh-release@v1

‎DotSquish/DotSquish.csproj‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
73
<ProjectGuid>{F9681545-4BEA-4FD3-9AB9-A67BD37AB36D}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>DotSquish</RootNamespace>
11-
<AssemblyName>DotSquish</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
4+
<TargetFramework>net7.0</TargetFramework>
5+
<OutputPath>bin\$(Configuration)\</OutputPath>
6+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
157
</PropertyGroup>
168
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
189
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25-
<Prefer32Bit>false</Prefer32Bit>
2610
</PropertyGroup>
2711
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2812
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
35-
<Prefer32Bit>false</Prefer32Bit>
3613
</PropertyGroup>
3714
<ItemGroup>
38-
<Reference Include="System" />
39-
<Reference Include="System.Core" />
40-
<Reference Include="System.Drawing" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Xml" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="Alpha.cs" />
49-
<Compile Include="ClusterFit.cs" />
50-
<Compile Include="ColourBlock.cs" />
51-
<Compile Include="ColourFit.cs" />
52-
<Compile Include="ColourSet.cs" />
53-
<Compile Include="Flags.cs" />
54-
<Compile Include="Maths.cs" />
55-
<Compile Include="Properties\AssemblyInfo.cs" />
56-
<Compile Include="Squish.cs" />
15+
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
5716
</ItemGroup>
58-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
59-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
60-
Other similar extension points exist, see Microsoft.Common.targets.
61-
<Target Name="BeforeBuild">
62-
</Target>
63-
<Target Name="AfterBuild">
64-
</Target>
65-
-->
6617
</Project>

‎DotSquish/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Godbert/Godbert.csproj‎

Lines changed: 14 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
73
<ProjectGuid>{6A5DA7FF-791E-4A43-BF65-B6942917F7D9}</ProjectGuid>
8-
<OutputType>WinExe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Godbert</RootNamespace>
11-
<AssemblyName>Godbert</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
144
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<WarningLevel>4</WarningLevel>
5+
<OutputType>WinExe</OutputType>
6+
<TargetFramework>net7.0-windows</TargetFramework>
167
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
178
<NuGetPackageImportStamp>
189
</NuGetPackageImportStamp>
@@ -28,29 +19,19 @@
2819
<MapFileExtensions>true</MapFileExtensions>
2920
<ApplicationRevision>0</ApplicationRevision>
3021
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<IsWebBootstrapper>false</IsWebBootstrapper>
32-
<UseApplicationTrust>false</UseApplicationTrust>
3322
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<TargetFrameworkProfile />
23+
<AssemblyTitle>Godbert</AssemblyTitle>
24+
<Product>Godbert</Product>
25+
<Copyright>Copyright © Rogueadyn 2015</Copyright>
26+
<OutputPath>bin\$(Configuration)\</OutputPath>
27+
<UseWpf>true</UseWpf>
28+
<PlatformTarget>x86</PlatformTarget>
3529
</PropertyGroup>
3630
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37-
<PlatformTarget>AnyCPU</PlatformTarget>
38-
<DebugSymbols>true</DebugSymbols>
3931
<DebugType>full</DebugType>
40-
<Optimize>false</Optimize>
41-
<OutputPath>bin\Debug\</OutputPath>
42-
<DefineConstants>DEBUG;TRACE</DefineConstants>
43-
<ErrorReport>prompt</ErrorReport>
44-
<WarningLevel>4</WarningLevel>
4532
</PropertyGroup>
4633
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47-
<PlatformTarget>AnyCPU</PlatformTarget>
4834
<DebugType>pdbonly</DebugType>
49-
<Optimize>true</Optimize>
50-
<OutputPath>bin\Release\</OutputPath>
51-
<DefineConstants>TRACE</DefineConstants>
52-
<ErrorReport>prompt</ErrorReport>
53-
<WarningLevel>4</WarningLevel>
5435
</PropertyGroup>
5536
<PropertyGroup>
5637
<ApplicationIcon>Godbert.ico</ApplicationIcon>
@@ -83,148 +64,13 @@
8364
<Reference Include="WindowsBase" />
8465
<Reference Include="PresentationCore" />
8566
<Reference Include="PresentationFramework" />
67+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
68+
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
69+
<PackageReference Include="SharpDX" Version="4.2.0" />
8670
</ItemGroup>
8771
<ItemGroup>
88-
<ApplicationDefinition Include="App.xaml">
89-
<Generator>MSBuild:Compile</Generator>
90-
<SubType>Designer</SubType>
91-
</ApplicationDefinition>
92-
<Compile Include="Commands\DelegateCommand.cs" />
93-
<Compile Include="Controls\AttachedImage.cs" />
94-
<Compile Include="Controls\ColumnFactory.cs" />
95-
<Compile Include="Controls\INavigatable.cs" />
96-
<Compile Include="Controls\IRawDataColumn.cs" />
97-
<Compile Include="Controls\RawDataGrid.cs" />
98-
<Compile Include="Controls\RawDataGridColorColumn.cs" />
99-
<Compile Include="Controls\RawDataGridImageColumn.cs" />
100-
<Compile Include="Controls\RawDataGridKeyColumn.cs" />
101-
<Compile Include="Controls\RawDataGridTextColumn.cs" />
102-
<Compile Include="Controls\RawDataItemsSource.cs" />
103-
<Compile Include="EngineHelper.cs" />
104-
<Compile Include="EngineInstance.cs" />
105-
<Compile Include="NaturalComparer.cs" />
106-
<Compile Include="ObservableBase.cs" />
107-
<Compile Include="Settings.cs" />
108-
<Compile Include="ViewModels\BookmarkViewModel.cs" />
109-
<Compile Include="ViewModels\DataViewModel.cs" />
110-
<Compile Include="ViewModels\DemihumanViewModel.cs" />
111-
<Compile Include="ViewModels\EquipmentViewModel.cs" />
112-
<Compile Include="ViewModels\FurnitureViewModel.cs" />
113-
<Compile Include="ViewModels\MainViewModel.cs" />
114-
<Compile Include="ViewModels\TerritoryViewModel.cs" />
115-
<Compile Include="ViewModels\MapsViewModel.cs" />
116-
<Compile Include="Models\ModelCharaHierarchy.cs" />
117-
<Compile Include="Models\ModelCharaMain.cs" />
118-
<Compile Include="Models\ModelCharaSub.cs" />
119-
<Compile Include="Models\ModelCharaVariant.cs" />
120-
<Compile Include="ViewModels\MonstersViewModel.cs" />
121-
<Compile Include="Views\DataView.xaml.cs">
122-
<DependentUpon>DataView.xaml</DependentUpon>
123-
</Compile>
124-
<Compile Include="Views\DemihumansView.xaml.cs">
125-
<DependentUpon>DemihumansView.xaml</DependentUpon>
126-
</Compile>
127-
<Compile Include="Views\EquipmentView.xaml.cs">
128-
<DependentUpon>EquipmentView.xaml</DependentUpon>
129-
</Compile>
130-
<Compile Include="Views\FurnitureView.xaml.cs">
131-
<DependentUpon>FurnitureView.xaml</DependentUpon>
132-
</Compile>
133-
<Compile Include="Views\Help3DView.xaml.cs">
134-
<DependentUpon>Help3DView.xaml</DependentUpon>
135-
</Compile>
136-
<Compile Include="Views\MapsView.xaml.cs">
137-
<DependentUpon>MapsView.xaml</DependentUpon>
138-
</Compile>
139-
<Compile Include="Views\MonstersView.xaml.cs">
140-
<DependentUpon>MonstersView.xaml</DependentUpon>
141-
</Compile>
142-
<Compile Include="Views\TerritoryView.xaml.cs">
143-
<DependentUpon>TerritoryView.xaml</DependentUpon>
144-
</Compile>
145-
<Compile Include="WpfHelper.cs" />
146-
<Page Include="MainWindow.xaml">
147-
<Generator>MSBuild:Compile</Generator>
148-
<SubType>Designer</SubType>
149-
</Page>
150-
<Compile Include="App.xaml.cs">
151-
<DependentUpon>App.xaml</DependentUpon>
152-
<SubType>Code</SubType>
153-
</Compile>
154-
<Compile Include="MainWindow.xaml.cs">
155-
<DependentUpon>MainWindow.xaml</DependentUpon>
156-
<SubType>Code</SubType>
157-
</Compile>
158-
<Page Include="Views\DataView.xaml">
159-
<SubType>Designer</SubType>
160-
<Generator>MSBuild:Compile</Generator>
161-
</Page>
162-
<Page Include="Views\DemihumansView.xaml">
163-
<SubType>Designer</SubType>
164-
<Generator>MSBuild:Compile</Generator>
165-
</Page>
166-
<Page Include="Views\EquipmentView.xaml">
167-
<SubType>Designer</SubType>
168-
<Generator>MSBuild:Compile</Generator>
169-
</Page>
170-
<Page Include="Views\FurnitureView.xaml">
171-
<SubType>Designer</SubType>
172-
<Generator>MSBuild:Compile</Generator>
173-
</Page>
174-
<Page Include="Views\Help3DView.xaml">
175-
<SubType>Designer</SubType>
176-
<Generator>MSBuild:Compile</Generator>
177-
</Page>
178-
<Page Include="Views\MapsView.xaml">
179-
<SubType>Designer</SubType>
180-
<Generator>MSBuild:Compile</Generator>
181-
</Page>
182-
<Page Include="Views\MonstersView.xaml">
183-
<SubType>Designer</SubType>
184-
<Generator>MSBuild:Compile</Generator>
185-
</Page>
186-
<Page Include="Views\TerritoryView.xaml">
187-
<SubType>Designer</SubType>
188-
<Generator>MSBuild:Compile</Generator>
189-
</Page>
190-
</ItemGroup>
191-
<ItemGroup>
192-
<Compile Include="Properties\AssemblyInfo.cs">
193-
<SubType>Code</SubType>
194-
</Compile>
195-
<Compile Include="Properties\Resources.Designer.cs">
196-
<AutoGen>True</AutoGen>
197-
<DesignTime>True</DesignTime>
198-
<DependentUpon>Resources.resx</DependentUpon>
199-
</Compile>
200-
<Compile Include="Properties\Settings.Designer.cs">
201-
<AutoGen>True</AutoGen>
202-
<DependentUpon>Settings.settings</DependentUpon>
203-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
204-
</Compile>
205-
<EmbeddedResource Include="Properties\Resources.resx">
206-
<Generator>ResXFileCodeGenerator</Generator>
207-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
208-
</EmbeddedResource>
209-
<None Include="packages.config" />
210-
<None Include="Properties\Settings.settings">
211-
<Generator>SettingsSingleFileGenerator</Generator>
212-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
213-
</None>
214-
<AppDesigner Include="Properties\" />
215-
</ItemGroup>
216-
<ItemGroup>
217-
<None Include="App.config" />
218-
</ItemGroup>
219-
<ItemGroup>
220-
<ProjectReference Include="..\SaintCoinach.Graphics.Viewer\SaintCoinach.Graphics.Viewer.csproj">
221-
<Project>{226bf71e-334f-4585-8fec-4239704cf539}</Project>
222-
<Name>SaintCoinach.Graphics.Viewer</Name>
223-
</ProjectReference>
224-
<ProjectReference Include="..\SaintCoinach\SaintCoinach.csproj">
225-
<Project>{8a7d65eb-3de3-4631-b286-cc73a3126002}</Project>
226-
<Name>SaintCoinach</Name>
227-
</ProjectReference>
72+
<ProjectReference Include="..\SaintCoinach.Graphics.Viewer\SaintCoinach.Graphics.Viewer.csproj" />
73+
<ProjectReference Include="..\SaintCoinach\SaintCoinach.csproj" />
22874
</ItemGroup>
22975
<ItemGroup>
23076
<Resource Include="Godbert.ico" />

‎Godbert/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44
using System.Runtime.InteropServices;
55
using System.Windows;
66

7-
// General Information about an assembly is controlled through the following
8-
// set of attributes. Change these attribute values to modify the information
9-
// associated with an assembly.
10-
[assembly: AssemblyTitle("Godbert")]
11-
[assembly: AssemblyDescription("")]
12-
[assembly: AssemblyConfiguration("")]
13-
[assembly: AssemblyCompany("")]
14-
[assembly: AssemblyProduct("Godbert")]
15-
[assembly: AssemblyCopyright("Copyright © Rogueadyn 2015")]
16-
[assembly: AssemblyTrademark("")]
17-
[assembly: AssemblyCulture("")]
18-
197
// Setting ComVisible to false makes the types in this assembly not visible
208
// to COM components. If you need to access a type in this assembly from
219
// COM, set the ComVisible attribute to true on that type.

‎Godbert/packages.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)