Skip to content

Commit 45784c9

Browse files
GpointChenGpointChen
committed
fix for update
1 parent dfe6285 commit 45784c9

File tree

4 files changed

+97
-320
lines changed

4 files changed

+97
-320
lines changed

‎DotSquish/DotSquish.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
16+
<PackageReference Include="UpgradeAssistant.Extension.ForceTFM" Version="1.0.8" />
1617
</ItemGroup>
1718
</Project>

‎Godbert/Godbert.csproj‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
<OutputType>WinExe</OutputType>
66
<TargetFramework>net7.0-windows</TargetFramework>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
8-
<NuGetPackageImportStamp>
9-
</NuGetPackageImportStamp>
10-
<PublishUrl>publish\</PublishUrl>
11-
<Install>true</Install>
12-
<InstallFrom>Disk</InstallFrom>
13-
<UpdateEnabled>false</UpdateEnabled>
14-
<UpdateMode>Foreground</UpdateMode>
15-
<UpdateInterval>7</UpdateInterval>
16-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
17-
<UpdatePeriodically>false</UpdatePeriodically>
18-
<UpdateRequired>false</UpdateRequired>
19-
<MapFileExtensions>true</MapFileExtensions>
208
<ApplicationRevision>0</ApplicationRevision>
219
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
2210
<BootstrapperEnabled>true</BootstrapperEnabled>
@@ -40,30 +28,6 @@
4028
<StartupObject />
4129
</PropertyGroup>
4230
<ItemGroup>
43-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
48-
</Reference>
49-
<Reference Include="SharpDX">
50-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
51-
</Reference>
52-
<Reference Include="System" />
53-
<Reference Include="System.Data" />
54-
<Reference Include="System.Drawing" />
55-
<Reference Include="System.Windows.Forms" />
56-
<Reference Include="System.Xml" />
57-
<Reference Include="Microsoft.CSharp" />
58-
<Reference Include="System.Core" />
59-
<Reference Include="System.Xml.Linq" />
60-
<Reference Include="System.Data.DataSetExtensions" />
61-
<Reference Include="System.Xaml">
62-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
63-
</Reference>
64-
<Reference Include="WindowsBase" />
65-
<Reference Include="PresentationCore" />
66-
<Reference Include="PresentationFramework" />
6731
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
6832
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
6933
<PackageReference Include="SharpDX" Version="4.2.0" />
@@ -75,33 +39,4 @@
7539
<ItemGroup>
7640
<Resource Include="Godbert.ico" />
7741
</ItemGroup>
78-
<ItemGroup>
79-
<BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
80-
<Visible>False</Visible>
81-
<ProductName>Microsoft .NET Framework 4.5.1 %28x86 and x64%29</ProductName>
82-
<Install>true</Install>
83-
</BootstrapperPackage>
84-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
85-
<Visible>False</Visible>
86-
<ProductName>.NET Framework 3.5 SP1</ProductName>
87-
<Install>false</Install>
88-
</BootstrapperPackage>
89-
</ItemGroup>
90-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91-
<Import Project="$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets')" />
92-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
93-
<PropertyGroup>
94-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
95-
</PropertyGroup>
96-
<Error Condition="!Exists('$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
97-
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
98-
</Target>
99-
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
100-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101-
Other similar extension points exist, see Microsoft.Common.targets.
102-
<Target Name="BeforeBuild">
103-
</Target>
104-
<Target Name="AfterBuild">
105-
</Target>
106-
-->
10742
</Project>

‎SaintCoinach.Graphics.Viewer/SaintCoinach.Graphics.Viewer.csproj‎

Lines changed: 96 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,98 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<ProjectGuid>{226BF71E-334F-4585-8FEC-4239704CF539}</ProjectGuid>
4-
<OutputType>Library</OutputType>
5-
<AppDesignerFolder>Properties</AppDesignerFolder>
6-
<RootNamespace>SaintCoinach.Graphics.Viewer</RootNamespace>
7-
<AssemblyName>SaintCoinach.Graphics.Viewer</AssemblyName>
8-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
9-
<FileAlignment>512</FileAlignment>
10-
<NuGetPackageImportStamp>
11-
</NuGetPackageImportStamp>
12-
<TargetFrameworkProfile />
13-
<TargetFramework>net7.0-windows</TargetFramework>
14-
<AssemblyTitle>SaintCoinach.Graphics.Viewer</AssemblyTitle>
15-
<Product>SaintCoinach.Graphics.Viewer</Product>
16-
<Copyright>Copyright © 2015</Copyright>
17-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
18-
<OutputPath>bin\$(Configuration)\</OutputPath>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugType>full</DebugType>
22-
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24-
<DebugType>pdbonly</DebugType>
25-
</PropertyGroup>
26-
<ItemGroup>
27-
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">
28-
<HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
29-
</Reference>
30-
<Reference Include="SharpDX">
31-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
32-
</Reference>
33-
<Reference Include="SharpDX.D3DCompiler">
34-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.D3DCompiler.dll</HintPath>
35-
</Reference>
36-
<Reference Include="SharpDX.Direct3D11">
37-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct3D11.dll</HintPath>
38-
</Reference>
39-
<Reference Include="SharpDX.Direct3D11.Effects">
40-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct3D11.Effects.dll</HintPath>
41-
</Reference>
42-
<Reference Include="SharpDX.DXGI">
43-
<HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
44-
</Reference>
45-
<Reference Include="System" />
46-
<Reference Include="System.Core" />
47-
<Reference Include="System.Drawing" />
48-
<Reference Include="System.Numerics" />
49-
<Reference Include="System.Numerics.Vectors" />
50-
<Reference Include="System.Windows.Forms" />
51-
<Reference Include="System.Xml.Linq" />
52-
<Reference Include="System.Data.DataSetExtensions" />
53-
<Reference Include="Microsoft.CSharp" />
54-
<Reference Include="System.Data" />
55-
<Reference Include="System.Xml" />
56-
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
57-
<PackageReference Include="SharpDX" Version="4.2.0" />
58-
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" />
59-
<PackageReference Include="SharpDX.Desktop" Version="4.2.0" />
60-
<PackageReference Include="SharpDX.Direct3D10" Version="4.2.0" />
61-
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
62-
<PackageReference Include="SharpDX.Direct3D11.Effects" Version="4.2.0" />
63-
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
64-
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
65-
</ItemGroup>
66-
<ItemGroup>
67-
<Compile Update="Keyboard.cs">
68-
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
69-
</Compile>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<Content Include="sharpdx_direct3d11_effects_x64.dll" />
73-
<Content Include="sharpdx_direct3d11_effects_x86.dll" />
74-
<EmbeddedResource Include="Viewer.ico" />
75-
<Content Include="Effects\HLSL\BasicEffect.fx">
76-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
77-
</Content>
78-
<Content Include="Effects\HLSL\BgUvScroll.fx">
79-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
80-
</Content>
81-
<Content Include="Effects\HLSL\Crystal.fx">
82-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
83-
</Content>
84-
<Content Include="Effects\HLSL\BgColorChange.fx">
85-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
86-
</Content>
87-
<Content Include="Effects\HLSL\Bg.fx">
88-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
89-
</Content>
90-
<Content Include="Effects\HLSL\Common.fxh">
91-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
92-
</Content>
93-
<Content Include="Effects\HLSL\Hair.fx">
94-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
95-
</Content>
96-
<Content Include="Effects\HLSL\Lighting.fxh">
97-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98-
</Content>
99-
<Content Include="Effects\HLSL\Iris.fx">
100-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101-
</Content>
102-
<Content Include="Effects\HLSL\Skin.fx">
103-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
104-
</Content>
105-
<Content Include="Effects\HLSL\Structures.fxh">
106-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
107-
</Content>
108-
<Content Include="Effects\HLSL\CustomizeParameter.fxh">
109-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
110-
</Content>
111-
<Content Include="Effects\HLSL\Common.Skinned.fxh">
112-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
113-
</Content>
114-
</ItemGroup>
115-
<ItemGroup>
116-
<Content Include="Effects\HLSL\Character.fx">
117-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
118-
</Content>
119-
<Content Include="fbxInterop.dll">
120-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121-
</Content>
122-
<Content Include="hkAnimationInterop.dll">
123-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
124-
</Content>
125-
<Content Include="libfbxsdk.dll">
126-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
127-
</Content>
128-
<Content Include="sharpdx_direct3d11_1_effects_x64.dll">
129-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
130-
</Content>
131-
<Content Include="sharpdx_direct3d11_1_effects_x86.dll">
132-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
133-
</Content>
134-
</ItemGroup>
135-
<ItemGroup>
136-
<ProjectReference Include="..\SaintCoinach\SaintCoinach.csproj" />
137-
</ItemGroup>
138-
<ItemGroup>
139-
<None Include="packages.config" />
140-
</ItemGroup>
141-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
142-
<Import Project="$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets')" />
143-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
144-
<PropertyGroup>
145-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
146-
</PropertyGroup>
147-
<Error Condition="!Exists('$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
148-
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
149-
</Target>
150-
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
151-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
152-
Other similar extension points exist, see Microsoft.Common.targets.
153-
<Target Name="BeforeBuild">
154-
</Target>
155-
<Target Name="AfterBuild">
156-
</Target>
157-
-->
2+
<PropertyGroup>
3+
<ProjectGuid>{226BF71E-334F-4585-8FEC-4239704CF539}</ProjectGuid>
4+
<TargetFramework>net7.0-windows</TargetFramework>
5+
<AssemblyTitle>SaintCoinach.Graphics.Viewer</AssemblyTitle>
6+
<Product>SaintCoinach.Graphics.Viewer</Product>
7+
<Copyright>Copyright © 2015</Copyright>
8+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9+
<OutputPath>bin\$(Configuration)\</OutputPath>
10+
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
12+
<DebugType>full</DebugType>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
15+
<DebugType>pdbonly</DebugType>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
19+
<PackageReference Include="SharpDX" Version="4.2.0" />
20+
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" />
21+
<PackageReference Include="SharpDX.Desktop" Version="4.2.0" />
22+
<PackageReference Include="SharpDX.Direct3D10" Version="4.2.0" />
23+
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
24+
<PackageReference Include="SharpDX.Direct3D11.Effects" Version="4.2.0" />
25+
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
26+
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<Compile Update="Keyboard.cs">
30+
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
31+
</Compile>
32+
</ItemGroup>
33+
<ItemGroup>
34+
<EmbeddedResource Include="Viewer.ico" />
35+
<Content Include="Effects\HLSL\BasicEffect.fx">
36+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
37+
</Content>
38+
<Content Include="Effects\HLSL\BgUvScroll.fx">
39+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
40+
</Content>
41+
<Content Include="Effects\HLSL\Crystal.fx">
42+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
43+
</Content>
44+
<Content Include="Effects\HLSL\BgColorChange.fx">
45+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
46+
</Content>
47+
<Content Include="Effects\HLSL\Bg.fx">
48+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
49+
</Content>
50+
<Content Include="Effects\HLSL\Common.fxh">
51+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
52+
</Content>
53+
<Content Include="Effects\HLSL\Hair.fx">
54+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
55+
</Content>
56+
<Content Include="Effects\HLSL\Lighting.fxh">
57+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
58+
</Content>
59+
<Content Include="Effects\HLSL\Iris.fx">
60+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
61+
</Content>
62+
<Content Include="Effects\HLSL\Skin.fx">
63+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
64+
</Content>
65+
<Content Include="Effects\HLSL\Structures.fxh">
66+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
67+
</Content>
68+
<Content Include="Effects\HLSL\CustomizeParameter.fxh">
69+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
70+
</Content>
71+
<Content Include="Effects\HLSL\Common.Skinned.fxh">
72+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
73+
</Content>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<Content Include="Effects\HLSL\Character.fx">
77+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
78+
</Content>
79+
<Content Include="fbxInterop.dll">
80+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81+
</Content>
82+
<Content Include="hkAnimationInterop.dll">
83+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84+
</Content>
85+
<Content Include="libfbxsdk.dll">
86+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
87+
</Content>
88+
<Content Include="sharpdx_direct3d11_1_effects_x64.dll">
89+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
90+
</Content>
91+
<Content Include="sharpdx_direct3d11_1_effects_x86.dll">
92+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
93+
</Content>
94+
</ItemGroup>
95+
<ItemGroup>
96+
<ProjectReference Include="..\SaintCoinach\SaintCoinach.csproj" />
97+
</ItemGroup>
15898
</Project>

0 commit comments

Comments
 (0)