• R/O
  • HTTP
  • SSH
  • HTTPS

dtxmaniaxg-verk-git: 提交

DTXManiaXG(Ver.K)4.00Series


Commit MetaInfo

修訂246227f1053fc9d816c8e20978cdd36ef6cecdb7 (tree)
時間2020-10-05 20:00:01
作者kairera0467 <kairera0467@user...>
Commiterkairera0467

Log Message

Merge pull request #40832 (from/dtxmaniaxg-verk-git/update-SharpDX-to-4.2.0 into work-s).

Change Summary

差異

--- a/DTXManiaプロジェクト/DTXManiaプロジェクト.csproj
+++ b/DTXManiaプロジェクト/DTXManiaプロジェクト.csproj
@@ -114,26 +114,17 @@
114114 </PropertyGroup>
115115 <ItemGroup>
116116 <Reference Include="Microsoft.VisualBasic" />
117- <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
118- <HintPath>packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
117+ <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
118+ <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
119119 </Reference>
120- <Reference Include="SharpDX.Animation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
121- <HintPath>packages\SharpDX.Animation.4.0.1\lib\net45\SharpDX.Animation.dll</HintPath>
120+ <Reference Include="SharpDX.Animation, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
121+ <HintPath>..\packages\SharpDX.Animation.4.2.0\lib\net45\SharpDX.Animation.dll</HintPath>
122122 </Reference>
123- <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124- <HintPath>packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
123+ <Reference Include="SharpDX.Direct3D9, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124+ <HintPath>..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll</HintPath>
125125 </Reference>
126- <Reference Include="SharpDX.DirectInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
127- <HintPath>packages\SharpDX.DirectInput.4.0.1\lib\net45\SharpDX.DirectInput.dll</HintPath>
128- </Reference>
129- <Reference Include="SharpDX.DirectSound, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
130- <HintPath>packages\SharpDX.DirectSound.4.0.1\lib\net45\SharpDX.DirectSound.dll</HintPath>
131- </Reference>
132- <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
133- <HintPath>packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
134- </Reference>
135- <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
136- <HintPath>packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
126+ <Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
127+ <HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
137128 </Reference>
138129 <Reference Include="System" />
139130 <Reference Include="System.Data" />
--- a/DTXManiaプロジェクト/packages.config
+++ b/DTXManiaプロジェクト/packages.config
@@ -1,10 +1,7 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <packages>
3- <package id="DirectShowLib" version="1.0.0" targetFramework="net471" />
4- <package id="SharpDX" version="4.0.1" targetFramework="net471" />
5- <package id="SharpDX.Animation" version="4.0.1" targetFramework="net471" />
6- <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net471" />
7- <package id="SharpDX.DirectInput" version="4.0.1" targetFramework="net471" />
8- <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net471" />
9- <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net471" />
3+ <package id="SharpDX" version="4.2.0" targetFramework="net471" />
4+ <package id="SharpDX.Animation" version="4.2.0" targetFramework="net471" />
5+ <package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net471" />
6+ <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net471" />
107 </packages>
\ No newline at end of file
--- a/FDK17プロジェクト/FDK19.csproj
+++ b/FDK17プロジェクト/FDK19.csproj
@@ -108,26 +108,23 @@
108108 <Reference Include="DirectShowLib, Version=2.1.0.1599, Culture=neutral, processorArchitecture=MSIL">
109109 <HintPath>..\packages\DirectShowLib.1.0.0\lib\DirectShowLib.dll</HintPath>
110110 </Reference>
111- <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
112- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
111+ <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
112+ <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
113113 </Reference>
114- <Reference Include="SharpDX.Animation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
115- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.Animation.4.0.1\lib\net45\SharpDX.Animation.dll</HintPath>
114+ <Reference Include="SharpDX.Direct3D9, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
115+ <HintPath>..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll</HintPath>
116116 </Reference>
117- <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
118- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
117+ <Reference Include="SharpDX.DirectInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
118+ <HintPath>..\packages\SharpDX.DirectInput.4.2.0\lib\net45\SharpDX.DirectInput.dll</HintPath>
119119 </Reference>
120- <Reference Include="SharpDX.DirectInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
121- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.DirectInput.4.0.1\lib\net45\SharpDX.DirectInput.dll</HintPath>
120+ <Reference Include="SharpDX.DirectSound, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
121+ <HintPath>..\packages\SharpDX.DirectSound.4.2.0\lib\net45\SharpDX.DirectSound.dll</HintPath>
122122 </Reference>
123- <Reference Include="SharpDX.DirectSound, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.DirectSound.4.0.1\lib\net45\SharpDX.DirectSound.dll</HintPath>
123+ <Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
124+ <HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
125125 </Reference>
126- <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
127- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
128- </Reference>
129- <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
130- <HintPath>..\DTXManiaプロジェクト\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
126+ <Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
127+ <HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
131128 </Reference>
132129 <Reference Include="System" />
133130 <Reference Include="System.Data" />
@@ -236,14 +233,14 @@
236233 </BootstrapperPackage>
237234 </ItemGroup>
238235 <ItemGroup>
239- <None Include="packages.config" />
240- </ItemGroup>
241- <ItemGroup>
242236 <ProjectReference Include="..\libbjxa\libbjxa.csproj">
243237 <Project>{41e67409-f5ec-4216-a790-2519a7b22e51}</Project>
244238 <Name>libbjxa</Name>
245239 </ProjectReference>
246240 </ItemGroup>
241+ <ItemGroup>
242+ <None Include="packages.config" />
243+ </ItemGroup>
247244 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
248245 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
249246 Other similar extension points exist, see Microsoft.Common.targets.
--- a/FDK17プロジェクト/packages.config
+++ b/FDK17プロジェクト/packages.config
@@ -1,11 +1,10 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <packages>
33 <package id="DirectShowLib" version="1.0.0" targetFramework="net471" />
4- <package id="SharpDX" version="4.0.1" targetFramework="net471" />
5- <package id="SharpDX.Animation" version="4.0.1" targetFramework="net471" />
6- <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net471" />
7- <package id="SharpDX.DirectInput" version="4.0.1" targetFramework="net471" />
8- <package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net471" />
9- <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net471" />
10- <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net471" />
4+ <package id="SharpDX" version="4.2.0" targetFramework="net471" />
5+ <package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net471" />
6+ <package id="SharpDX.DirectInput" version="4.2.0" targetFramework="net471" />
7+ <package id="SharpDX.DirectSound" version="4.2.0" targetFramework="net471" />
8+ <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net471" />
9+ <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net471" />
1110 </packages>
\ No newline at end of file
Binary files a/実行時フォルダ/dll/SharpDX.Animation.dll and b/実行時フォルダ/dll/SharpDX.Animation.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.DXGI.dll and b/実行時フォルダ/dll/SharpDX.DXGI.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.Direct3D9.dll and b/実行時フォルダ/dll/SharpDX.Direct3D9.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.DirectInput.dll and b/実行時フォルダ/dll/SharpDX.DirectInput.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.DirectSound.dll and b/実行時フォルダ/dll/SharpDX.DirectSound.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.Mathematics.dll and b/実行時フォルダ/dll/SharpDX.Mathematics.dll differ
Binary files a/実行時フォルダ/dll/SharpDX.dll and b/実行時フォルダ/dll/SharpDX.dll differ
Show on old repository browser