Merge pull request #169 from kwsch/f/netstandard-project

Convert core project type
This commit is contained in:
Kurt 2017-07-17 18:08:27 -07:00 committed by GitHub
commit 62011f77b9
4 changed files with 27 additions and 165 deletions

View File

@ -1,35 +0,0 @@
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("pk3DS.Core")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("pk3DS.Core")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("bc4d176c-9471-432a-82eb-abf9af1d6dfd")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@ -1,122 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>pk3DS.Core</RootNamespace>
<AssemblyName>pk3DS.Core</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworks>net40</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="CTR\AES.cs" />
<Compile Include="CTR\BCLIM.cs" />
<Compile Include="CTR\BLZ.cs" />
<Compile Include="CTR\CRO.cs" />
<Compile Include="CTR\CTR.cs" />
<Compile Include="CTR\DARC.cs" />
<Compile Include="CTR\ETC1.cs" />
<Compile Include="CTR\ExeFS.cs" />
<Compile Include="CTR\Exheader.cs" />
<Compile Include="CTR\FileFormat.cs" />
<Compile Include="CTR\GARC.cs" />
<Compile Include="CTR\LZSS.cs" />
<Compile Include="CTR\mini.cs" />
<Compile Include="CTR\NCCH.cs" />
<Compile Include="CTR\NCSD.cs" />
<Compile Include="CTR\RomFS.cs" />
<Compile Include="CTR\SMDH.cs" />
<Compile Include="Game\GameBackup.cs" />
<Compile Include="Game\GameConfig.cs" />
<Compile Include="Game\GameRNG.cs" />
<Compile Include="Game\GameVersion.cs" />
<Compile Include="Game\GARCFile.cs" />
<Compile Include="Game\GARCReference.cs" />
<Compile Include="Game\TextReference.cs" />
<Compile Include="Game\TextVariableCode.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Structures\EggMoves.cs" />
<Compile Include="Structures\EncounterStatic.cs" />
<Compile Include="Structures\Gen6\EncounterGift6.cs" />
<Compile Include="Structures\Gen6\EncounterStatic6.cs" />
<Compile Include="Structures\Gen6\Evolutions.cs" />
<Compile Include="Structures\Gen6\Item6.cs" />
<Compile Include="Structures\Gen6\Maison6.cs" />
<Compile Include="Structures\Gen6\MegaEvolution6.cs" />
<Compile Include="Structures\Gen6\Move6.cs" />
<Compile Include="Structures\Gen6\trdata6.cs" />
<Compile Include="Structures\Gen7\EncounterGift7.cs" />
<Compile Include="Structures\Gen7\EncounterStatic7.cs" />
<Compile Include="Structures\Gen7\EncounterTrade7.cs" />
<Compile Include="Structures\Gen7\Maison7.cs" />
<Compile Include="Structures\Gen7\trdata7.cs" />
<Compile Include="Structures\Gen7\trpoke7.cs" />
<Compile Include="Structures\Gen7\ZoneData7.cs" />
<Compile Include="Structures\Learnset.cs" />
<Compile Include="Structures\PersonalInfo\PersonalInfo.cs" />
<Compile Include="Structures\PersonalInfo\PersonalInfoORAS.cs" />
<Compile Include="Structures\PersonalInfo\PersonalInfoSM.cs" />
<Compile Include="Structures\PersonalInfo\PersonalInfoXY.cs" />
<Compile Include="Structures\PersonalInfo\PersonalTable.cs" />
<Compile Include="Structures\TypeChart.cs" />
<Compile Include="TextFile.cs" />
<Compile Include="Util.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\asm_mov" />
<None Include="Resources\ETC1Lib.dll" />
<None Include="Resources\romdata\byte\Logo\Distributed.bin" />
<None Include="Resources\romdata\byte\Logo\iQue.bin" />
<None Include="Resources\romdata\byte\Logo\iQueForSystem.bin" />
<None Include="Resources\romdata\byte\Logo\Licensed.bin" />
<None Include="Resources\romdata\byte\Logo\Nintendo.bin" />
<None Include="Resources\romdata\byte\PlainRegion\ORAS.bin" />
<None Include="Resources\romdata\byte\PlainRegion\XY.bin" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\romdata\txt\3dsgames.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
VisualStudioVersion = 15.0.26430.15
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pk3DS", "pk3DS\pk3DS.csproj", "{C4CB2488-2DB9-489F-8B02-A8E872C6C6AB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pk3DS.Core", "pk3DS.Core\pk3DS.Core.csproj", "{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pk3DS.Core", "pk3DS.Core\pk3DS.Core.csproj", "{053212FC-2D93-427B-8695-78EC87E4C43C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -23,14 +23,14 @@ Global
{C4CB2488-2DB9-489F-8B02-A8E872C6C6AB}.Release|Any CPU.Build.0 = Release|Any CPU
{C4CB2488-2DB9-489F-8B02-A8E872C6C6AB}.Release|x86.ActiveCfg = Release|x86
{C4CB2488-2DB9-489F-8B02-A8E872C6C6AB}.Release|x86.Build.0 = Release|x86
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Debug|x86.ActiveCfg = Debug|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Debug|x86.Build.0 = Debug|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Release|Any CPU.Build.0 = Release|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Release|x86.ActiveCfg = Release|Any CPU
{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}.Release|x86.Build.0 = Release|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Debug|x86.ActiveCfg = Debug|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Debug|x86.Build.0 = Debug|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Release|Any CPU.Build.0 = Release|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Release|x86.ActiveCfg = Release|Any CPU
{053212FC-2D93-427B-8695-78EC87E4C43C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -541,12 +541,6 @@
<ItemGroup>
<None Include="Resources\img\F.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\pk3DS.Core\pk3DS.Core.csproj">
<Project>{BC4D176C-9471-432A-82EB-ABF9AF1D6DFD}</Project>
<Name>pk3DS.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\changelog.txt" />
</ItemGroup>
@ -2998,6 +2992,12 @@
<None Include="Resources\img\Pokemon Sprites\_.png" />
<None Include="Resources\img\N.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\pk3DS.Core\pk3DS.Core.csproj">
<Project>{053212fc-2d93-427b-8695-78ec87e4c43c}</Project>
<Name>pk3DS.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.