Skip to content
This repository has been archived by the owner on Mar 9, 2020. It is now read-only.

Commit

Permalink
Revert "次の 4 ファイルに対する既存の変更が原因で、操作を完了できません:"
Browse files Browse the repository at this point in the history
This reverts commit ab4d0c8.
  • Loading branch information
rhimm committed Dec 9, 2018
1 parent ab4d0c8 commit 51a0277
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Expand Up @@ -15,6 +15,3 @@
/Test/bs1770gain**
/Test/dll/CSharpTest.Net.Collections.*
/Test/dll/SlimDX.*
/DTXManiaプロジェクト.Tests/rhimm_c.pfx
/DTXManiaプロジェクト/rhimm_c.pfx
/Test/System/SimpleStyle/Graphics/5_Game/16_Runner/_0.png
Expand Up @@ -36,12 +36,6 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>rhimm_c.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.11.0\lib\net35\nunit.framework.dll</HintPath>
Expand Down Expand Up @@ -409,7 +403,6 @@
<Content Include="コード\スコア、曲\approved\expected_case_2_only.2.tja">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="rhimm_c.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DTXManiaプロジェクト\DTXManiaプロジェクト.csproj">
Expand Down
3 changes: 1 addition & 2 deletions FDK17プロジェクト/FDK19.csproj
Expand Up @@ -13,7 +13,7 @@
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>rhimm_c.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>slimdx_aioilight.snk</AssemblyOriginatorKeyFile>
<ApplicationIcon>
</ApplicationIcon>
<FileUpgradeFlags>
Expand Down Expand Up @@ -167,7 +167,6 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="rhimm_c.pfx" />
<None Include="slimdx_aioilight.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Binary file modified Test/dll/FDK.dll
Binary file not shown.

0 comments on commit 51a0277

Please sign in to comment.