Skip to content

Commit 21dd8cd

Browse files
committed
refactor: プロジェクトのプラットフォームを x64 に限定
- dotnet build で他のプラットフォームが参照され CsWin32 でエラーになることがあったため
1 parent def9f48 commit 21dd8cd

12 files changed

Lines changed: 8 additions & 292 deletions

File tree

NeeView.Susie.Server/NeeView.Susie.Server.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
<PropertyGroup>
66
<OutputType>WinExe</OutputType>
7-
<TargetFramework>net10.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
<Platforms>x86</Platforms>
9+
<Platform>x86</Platform>
10+
<PlatformTarget>x86</PlatformTarget>
911
<Nullable>enable</Nullable>
1012
<ApplicationIcon>App.ico</ApplicationIcon>
1113
<CETCompat>false</CETCompat>
@@ -17,10 +19,6 @@
1719
<Product>NeeView SusiePlugin Server</Product>
1820
</PropertyGroup>
1921

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
</PropertyGroup>
23-
2422
<ItemGroup>
2523
<ProjectReference Include="..\NeeLaboratory.Remote\NeeLaboratory.Remote.csproj" />
2624
<ProjectReference Include="..\NeeView.Susie\NeeView.Susie.csproj" />

NeeView.sln

Lines changed: 1 addition & 187 deletions
Large diffs are not rendered by default.
-6.01 MB
Binary file not shown.
-171 KB
Binary file not shown.
-21.5 KB
Binary file not shown.

NeeView/Libraries/x86/libwebp.dll

-285 KB
Binary file not shown.
-16.5 KB
Binary file not shown.
-89.2 KB
Binary file not shown.

NeeView/MediaInfo/MediaInfoDLL.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ public enum Status
7575

7676
public class MediaInfo
7777
{
78-
#if X64
7978
private const string DllName = @"Libraries\x64\MediaInfo.dll";
80-
#else
81-
private const string DllName = @"Libraries\x86\MediaInfo.dll";
82-
#endif
8379

8480
//Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
8581
[DllImport(DllName)]

NeeView/NeeView.csproj

Lines changed: 4 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -10,73 +10,21 @@
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
<ApplicationManifest>App.manifest</ApplicationManifest>
1212
<ApplicationIcon>Resources\App.ico</ApplicationIcon>
13-
<Platforms>AnyCPU;x64;x86</Platforms>
13+
<Platforms>x64</Platforms>
14+
<Platform>x64</Platform>
15+
<PlatformTarget>x64</PlatformTarget>
1416
<Configurations>Debug;Release;Remote</Configurations>
1517
<CETCompat>false</CETCompat>
1618
</PropertyGroup>
1719

18-
<PropertyGroup>
19-
<NoWarn>$(NoWarn);WFAC010</NoWarn>
20-
</PropertyGroup>
21-
22-
<Target Name="FixAL1703Warning" BeforeTargets="GenerateSatelliteAssemblies" Condition="'$(PlatformTarget)' == 'x64'">
23-
<Message Text="Adjusting SDK tools directory to use x64 version of AL.EXE" />
24-
<PropertyGroup>
25-
<SdkToolsPathMaybeWithx64Architecture>$(TargetFrameworkSDKToolsDirectory)$(PlatformTarget)\</SdkToolsPathMaybeWithx64Architecture>
26-
</PropertyGroup>
27-
</Target>
28-
2920
<PropertyGroup>
3021
<Description>Image viewer</Description>
3122
</PropertyGroup>
3223

33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
34-
<PlatformTarget>AnyCPU</PlatformTarget>
35-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
36-
</PropertyGroup>
37-
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Remote|AnyCPU'">
39-
<PlatformTarget>AnyCPU</PlatformTarget>
40-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
41-
</PropertyGroup>
42-
43-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
44-
<PlatformTarget>x86</PlatformTarget>
45-
<DefineConstants>TRACE;DEBUG;X86</DefineConstants>
46-
</PropertyGroup>
47-
48-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Remote|x86'">
49-
<PlatformTarget>x86</PlatformTarget>
50-
<DefineConstants>TRACE;DEBUG;X86</DefineConstants>
51-
</PropertyGroup>
52-
53-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
54-
<PlatformTarget>x64</PlatformTarget>
55-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
56-
<OutputPath></OutputPath>
57-
</PropertyGroup>
58-
59-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Remote|x64'">
60-
<PlatformTarget>x64</PlatformTarget>
61-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
24+
<PropertyGroup Condition="'$(Configuration)'=='Remote'">
6225
<OutputPath>C:\NeeLaboratory\NeeView\Debug\</OutputPath>
6326
</PropertyGroup>
6427

65-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
66-
<PlatformTarget>AnyCPU</PlatformTarget>
67-
<DefineConstants>TRACE;X64</DefineConstants>
68-
</PropertyGroup>
69-
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
71-
<PlatformTarget>x86</PlatformTarget>
72-
<DefineConstants>TRACE;X86</DefineConstants>
73-
</PropertyGroup>
74-
75-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
76-
<PlatformTarget>x64</PlatformTarget>
77-
<DefineConstants>TRACE;X64</DefineConstants>
78-
</PropertyGroup>
79-
8028
<ItemGroup>
8129
<None Remove="Languages\ConvertRestext.ps1" />
8230
</ItemGroup>
@@ -178,24 +126,6 @@
178126
<Content Include="Libraries\x64\NeeView.Interop.dll">
179127
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
180128
</Content>
181-
<Content Include="Libraries\x86\vcruntime140.dll">
182-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
183-
</Content>
184-
<Content Include="Libraries\x86\libsharpyuv.dll">
185-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
186-
</Content>
187-
<Content Include="Libraries\x86\libwebp.dll">
188-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189-
</Content>
190-
<Content Include="Libraries\x86\libwebpdemux.dll">
191-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
192-
</Content>
193-
<Content Include="Libraries\x86\MediaInfo.dll">
194-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
195-
</Content>
196-
<Content Include="Libraries\x86\NeeView.Interop.dll">
197-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198-
</Content>
199129
</ItemGroup>
200130

201131
<ItemGroup>

0 commit comments

Comments
 (0)