Merge pull request #54 from jkotas/desktop-fix
Change desktop project to be x64-specific and project.json
This commit is contained in:
Jan Kotas
Коммит
61c7146f87
|
|
@ -15,30 +15,30 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "desktop", "desktop\desktop.
|
|||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x64.Build.0 = Release|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x64.Build.0 = Release|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x64.Build.0 = Release|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x64.Build.0 = Debug|x64
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x64.ActiveCfg = Release|x64
|
||||
{B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
|
|
@ -32,27 +32,6 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.IO.FileSystem">
|
||||
<HintPath>..\..\..\packages\System.IO.FileSystem.4.0.0\lib\net46\System.IO.FileSystem.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.Primitives">
|
||||
<HintPath>..\..\..\packages\System.IO.FileSystem.Primitives.4.0.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection.Metadata">
|
||||
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.22\lib\dotnet\System.Reflection.Metadata.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\src\Program.cs" />
|
||||
</ItemGroup>
|
||||
|
|
@ -75,7 +54,7 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
<None Include="project.json" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="System.Collections" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net46" />
|
||||
<package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Globalization" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.IO" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.IO.FileSystem" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Linq" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Reflection" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Reflection.Extensions" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Reflection.Metadata" version="1.0.22" targetFramework="net46" />
|
||||
<package id="System.Reflection.Primitives" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Runtime" version="4.0.20" targetFramework="net46" />
|
||||
<package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Runtime.Handles" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Runtime.InteropServices" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Text.Encoding" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Threading" version="4.0.0" targetFramework="net46" />
|
||||
<package id="System.Threading.Tasks" version="4.0.0" targetFramework="net46" />
|
||||
</packages>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"System.Runtime": "4.0.20",
|
||||
"System.Resources.ResourceManager": "4.0.0",
|
||||
"System.Reflection.Primitives": "4.0.0",
|
||||
"System.Diagnostics.Debug": "4.0.10",
|
||||
"System.IO": "4.0.10",
|
||||
"System.IO.FileSystem": "4.0.0",
|
||||
"System.Collections": "4.0.10",
|
||||
"System.Text.Encoding": "4.0.10",
|
||||
"System.Runtime.InteropServices": "4.0.20",
|
||||
"System.Reflection": "4.0.0",
|
||||
"System.Runtime.Extensions": "4.0.10",
|
||||
"System.Threading": "4.0.10",
|
||||
"System.Text.Encoding.Extensions": "4.0.10",
|
||||
"System.Reflection.Extensions": "4.0.0",
|
||||
"System.Console": "4.0.0-beta-*",
|
||||
"System.AppContext": "4.0.0",
|
||||
"System.Collections.Immutable": "1.1.37",
|
||||
"System.Reflection.Metadata": "1.0.22"
|
||||
},
|
||||
"frameworks": {
|
||||
"net46": {}
|
||||
},
|
||||
"runtimes": {
|
||||
"win-x64": {}
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче