• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

Commit MetaInfo

Revisiona3da6d5922128131641a013dcc2d215e69df5576 (tree)
Zeit2021-10-18 22:24:55
Autoryyagi <yyagi.dtxmania@gmai...>
Commiteryyagi

Log Message

#xxxxx FDKに署名を付与。また、そのために、FDKと連動するライブラリ(libbjxa, NVorbis)にも署名を付与。更にDirectShowLib.dllは署名なしのdllだったため、署名ありのもの(DIrectShowLib=2005.dll)に変更。署名用のファイルにはSlimDXKey_yyagi.snk)を指定しているが、このファイルは非公開のため適宜自前で作成のこと。
#xxxxx nugetで関連ライブラリを最新のものに更新(SharpDX関連を除く)

Ändern Zusammenfassung

Diff

--- a/DTXCreator/app.config
+++ b/DTXCreator/app.config
@@ -1,16 +1,20 @@
1-<?xml version="1.0"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <configuration>
33 <startup useLegacyV2RuntimeActivationPolicy="true">
4- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
5- <supportedRuntime version="v2.0.50727"/>
6- <supportedRuntime version="v1.1.4322"/>
7- <supportedRuntime version="v1.0.3705"/>
4+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
5+ <supportedRuntime version="v2.0.50727" />
6+ <supportedRuntime version="v1.1.4322" />
7+ <supportedRuntime version="v1.0.3705" />
88 </startup>
99
1010 <runtime>
11- <loadFromRemoteSources enabled="true"/>
11+ <loadFromRemoteSources enabled="true" />
1212 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13- <probing privatePath="dll"/>
13+ <probing privatePath="dll" />
14+ <dependentAssembly>
15+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
16+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
17+ </dependentAssembly>
1418 </assemblyBinding>
1519 </runtime>
1620 </configuration>
--- a/DTXMania/app.config
+++ b/DTXMania/app.config
@@ -1,16 +1,20 @@
1-<?xml version="1.0"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <configuration>
33 <startup useLegacyV2RuntimeActivationPolicy="true">
4- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
5- <supportedRuntime version="v2.0.50727"/>
6- <supportedRuntime version="v1.1.4322"/>
7- <supportedRuntime version="v1.0.3705"/>
4+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
5+ <supportedRuntime version="v2.0.50727" />
6+ <supportedRuntime version="v1.1.4322" />
7+ <supportedRuntime version="v1.0.3705" />
88 </startup>
99 <runtime>
10- <loadFromRemoteSources enabled="true"/>
11- <generatePublisherEvidence enabled="false"/>
10+ <loadFromRemoteSources enabled="true" />
11+ <generatePublisherEvidence enabled="false" />
1212 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13- <probing privatePath="dll"/>
13+ <probing privatePath="dll" />
14+ <dependentAssembly>
15+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
16+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
17+ </dependentAssembly>
1418 </assemblyBinding>
1519 </runtime>
1620 </configuration>
--- a/FDK/FDK.csproj
+++ b/FDK/FDK.csproj
@@ -13,8 +13,7 @@
1313 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <SignAssembly>true</SignAssembly>
16- <AssemblyOriginatorKeyFile>
17- </AssemblyOriginatorKeyFile>
16+ <AssemblyOriginatorKeyFile>SlimDXKey_yyagi.snk</AssemblyOriginatorKeyFile>
1817 <ApplicationIcon>
1918 </ApplicationIcon>
2019 <FileUpgradeFlags>
@@ -107,8 +106,8 @@
107106 <SpecificVersion>False</SpecificVersion>
108107 <HintPath>..\RuntimeResources\dll\Bass.Net.dll</HintPath>
109108 </Reference>
110- <Reference Include="DirectShowLib, Version=2.1.0.1599, Culture=neutral, processorArchitecture=MSIL">
111- <HintPath>..\RuntimeResources\dll\DirectShowLib.dll</HintPath>
109+ <Reference Include="DirectShowLib-2005">
110+ <HintPath>..\RuntimeResources\dll\DirectShowLib-2005.dll</HintPath>
112111 </Reference>
113112 <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
114113 <HintPath>..\RuntimeResources\dll\SharpDX.dll</HintPath>
@@ -129,9 +128,23 @@
129128 <HintPath>..\RuntimeResources\dll\SharpDX.Mathematics.dll</HintPath>
130129 </Reference>
131130 <Reference Include="System" />
131+ <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
132+ <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
133+ </Reference>
132134 <Reference Include="System.Data" />
133135 <Reference Include="System.Drawing" />
134136 <Reference Include="System.Management" />
137+ <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
138+ <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
139+ </Reference>
140+ <Reference Include="System.Numerics" />
141+ <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142+ <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
143+ </Reference>
144+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
145+ <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
146+ </Reference>
147+ <Reference Include="System.Runtime.Serialization" />
135148 <Reference Include="System.Windows.Forms" />
136149 <Reference Include="System.Xml" />
137150 </ItemGroup>
@@ -225,7 +238,9 @@
225238 <Content Include="コード\01.フレームワーク\Resources\sdx_icon_black.ico" />
226239 </ItemGroup>
227240 <ItemGroup>
241+ <None Include="app.config" />
228242 <None Include="packages.config" />
243+ <None Include="SlimDXKey_yyagi.snk" />
229244 </ItemGroup>
230245 <ItemGroup>
231246 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
--- a/FDK/Properties/AssemblyInfo.cs
+++ b/FDK/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Resources;
1111 [assembly: AssemblyConfiguration("")]
1212 [assembly: AssemblyCompany("")]
1313 [assembly: AssemblyProduct( "FDKライブラリ ver.21" )]
14-[assembly: AssemblyCopyright( "Copyright(C) 2000-2017 DTXMania Group" )]
14+[assembly: AssemblyCopyright("Copyright(C) 2000-2021 DTXMania Group")]
1515 [assembly: AssemblyTrademark("")]
1616 [assembly: AssemblyCulture("")]
1717 //[assembly: AssemblyKeyName( "FROMsCspContainer" )]
--- /dev/null
+++ b/FDK/app.config
@@ -0,0 +1,11 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<configuration>
3+ <runtime>
4+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+ <dependentAssembly>
6+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
8+ </dependentAssembly>
9+ </assemblyBinding>
10+ </runtime>
11+</configuration>
\ No newline at end of file
--- a/FDK/packages.config
+++ b/FDK/packages.config
@@ -7,4 +7,8 @@
77 <package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net451" />
88 <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net451" />
99 <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net451" />
10+ <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
11+ <package id="System.Memory" version="4.5.4" targetFramework="net472" />
12+ <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
13+ <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
1014 </packages>
\ No newline at end of file
--- a/NVorbis/NVorbis.csproj
+++ b/NVorbis/NVorbis.csproj
@@ -22,6 +22,9 @@
2222 <GenerateDocumentationFile>true</GenerateDocumentationFile>
2323 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2424 <NoWarn>1701,1702,1591</NoWarn>
25+ <SignAssembly>true</SignAssembly>
26+ <AssemblyOriginatorKeyFile>SlimDXKey_yyagi.snk</AssemblyOriginatorKeyFile>
27+ <DelaySign>false</DelaySign>
2528 </PropertyGroup>
2629
2730 <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
--- a/RuntimeResources/DTXCreator.exe.config
+++ b/RuntimeResources/DTXCreator.exe.config
@@ -1,16 +1,20 @@
1-<?xml version="1.0"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <configuration>
33 <startup useLegacyV2RuntimeActivationPolicy="true">
4- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
5- <supportedRuntime version="v2.0.50727"/>
6- <supportedRuntime version="v1.1.4322"/>
7- <supportedRuntime version="v1.0.3705"/>
4+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
5+ <supportedRuntime version="v2.0.50727" />
6+ <supportedRuntime version="v1.1.4322" />
7+ <supportedRuntime version="v1.0.3705" />
88 </startup>
99
1010 <runtime>
11- <loadFromRemoteSources enabled="true"/>
11+ <loadFromRemoteSources enabled="true" />
1212 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13- <probing privatePath="dll"/>
13+ <probing privatePath="dll" />
14+ <dependentAssembly>
15+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
16+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
17+ </dependentAssembly>
1418 </assemblyBinding>
1519 </runtime>
1620 </configuration>
--- a/RuntimeResources/DTXManiaGR.exe.config
+++ b/RuntimeResources/DTXManiaGR.exe.config
@@ -1,16 +1,20 @@
1-<?xml version="1.0"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <configuration>
33 <startup useLegacyV2RuntimeActivationPolicy="true">
4- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
5- <supportedRuntime version="v2.0.50727"/>
6- <supportedRuntime version="v1.1.4322"/>
7- <supportedRuntime version="v1.0.3705"/>
4+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
5+ <supportedRuntime version="v2.0.50727" />
6+ <supportedRuntime version="v1.1.4322" />
7+ <supportedRuntime version="v1.0.3705" />
88 </startup>
99 <runtime>
10- <loadFromRemoteSources enabled="true"/>
11- <generatePublisherEvidence enabled="false"/>
10+ <loadFromRemoteSources enabled="true" />
11+ <generatePublisherEvidence enabled="false" />
1212 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13- <probing privatePath="dll"/>
13+ <probing privatePath="dll" />
14+ <dependentAssembly>
15+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
16+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
17+ </dependentAssembly>
1418 </assemblyBinding>
1519 </runtime>
1620 </configuration>
Binary files /dev/null and b/RuntimeResources/dll/DirectShowLib-2005.dll differ
Binary files a/RuntimeResources/dll/DirectShowLib.dll and /dev/null differ
--- a/libbjxa/libbjxa.csproj
+++ b/libbjxa/libbjxa.csproj
@@ -22,6 +22,7 @@
2222 <DefineConstants>DEBUG;TRACE</DefineConstants>
2323 <ErrorReport>prompt</ErrorReport>
2424 <WarningLevel>4</WarningLevel>
25+ <BaseAddress>4718592</BaseAddress>
2526 </PropertyGroup>
2627 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728 <DebugType>pdbonly</DebugType>
@@ -67,6 +68,12 @@
6768 <ErrorReport>prompt</ErrorReport>
6869 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
6970 </PropertyGroup>
71+ <PropertyGroup>
72+ <SignAssembly>true</SignAssembly>
73+ </PropertyGroup>
74+ <PropertyGroup>
75+ <AssemblyOriginatorKeyFile>SlimDXKey_yyagi.snk</AssemblyOriginatorKeyFile>
76+ </PropertyGroup>
7077 <ItemGroup>
7178 <Reference Include="System" />
7279 <Reference Include="System.Core" />
@@ -81,6 +88,9 @@
8188 <Compile Include="libbjxa.cs" />
8289 <Compile Include="Properties\AssemblyInfo.cs" />
8390 </ItemGroup>
91+ <ItemGroup>
92+ <None Include="SlimDXKey_yyagi.snk" />
93+ </ItemGroup>
8494 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8595 <Target Name="AfterBuild">
8696 <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(SolutionDir)$(OutDir)dll" />