Browse Source

Revert Daniel's change 00c5997daaa40f0ee73c8b7d7eccf7b4dfd04194 as it prevents the solution from building on Mac

miguel 5 years ago
parent
commit
6c8917dd30
5 changed files with 101 additions and 29 deletions
  1. 1 1
      .travis.yml
  2. 47 8
      Designer/Designer.csproj
  3. 44 7
      Example/Example.csproj
  4. 0 12
      README.md
  5. 9 1
      Terminal.Gui/Terminal.Gui.csproj

+ 1 - 1
.travis.yml

@@ -5,6 +5,6 @@ script:
   - msbuild /t:Restore $TRAVIS_BUILD_DIR/Terminal.sln
   - cd $TRAVIS_BUILD_DIR/
   - msbuild /p:Configuration=Release Terminal.sln
-mono: "5.20.0"
+mono: "5.20.1"
 dotnet: "2.1.4"
 os: "osx"

+ 47 - 8
Designer/Designer.csproj

@@ -1,17 +1,56 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{1228D992-C801-49BB-839A-7BD28A3FFF0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Terminal</RootNamespace>
-    <AssemblyName>Terminal</AssemblyName>
+    <RootNamespace>Designer</RootNamespace>
+    <AssemblyName>Designer</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ExternalConsole>true</ExternalConsole>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
     <ExternalConsole>true</ExternalConsole>
-    <Platforms>AnyCPU;x86</Platforms>
-    <Platform>x86</Platform>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NStack.Core" Version="0.11.0" />
+    <Reference Include="System" />
+    <Reference Include="NStack">
+      <HintPath>..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+    </Reference>
+    <Reference Include="NStack">
+      <HintPath>..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj">
+      <Project>{00F366F8-DEE4-482C-B9FD-6DB0200B79E5}</Project>
+      <Name>Terminal.Gui</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

+ 44 - 7
Example/Example.csproj

@@ -1,18 +1,55 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{B0A602CD-E176-449D-8663-64238D54F857}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Terminal</RootNamespace>
     <AssemblyName>Terminal</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ExternalConsole>true</ExternalConsole>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\Terminal.xml</DocumentationFile>
     <ExternalConsole>true</ExternalConsole>
-    <Platforms>AnyCPU;x86</Platforms>
-    <Platform>x86</Platform>
-    <DefaultItemExcludes>StandaloneExample\**\*.*;Terminal.Gui\**\*.*</DefaultItemExcludes>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NStack.Core" Version="0.11.0" />
+    <Reference Include="System" />
+    <Reference Include="NStack">
+      <HintPath>..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NStack">
+      <HintPath>..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="demo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj">
+      <Project>{00F366F8-DEE4-482C-B9FD-6DB0200B79E5}</Project>
+      <Name>Terminal.Gui</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

+ 0 - 12
README.md

@@ -213,15 +213,3 @@ package version has been updated on the
 Terminal.Gui/Terminal.Gui.csproj, and push.
 
 Then once the package is built, VSTS will request an approval.
-
-
-# Known Issues
-
-There is a [known issue](https://github.com/NuGet/Home/issues/4837) that causes the
-referenced package assemblies to be missing from the output directory of your console 
-apps and therefore fail at run-time. In order to force the copying, you can add the 
-following property to your console project:
-
-```xml
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-```

+ 9 - 1
Terminal.Gui/Terminal.Gui.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <PackageId>Terminal.Gui</PackageId>
-    <PackageVersion>0.25</PackageVersion>
+    <PackageVersion>0.24</PackageVersion>
     <Authors>Miguel de Icaza</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/migueldeicaza/gui.cs/</PackageProjectUrl>
@@ -69,6 +69,14 @@
   <ItemGroup>
     <Folder Include="Dialogs\" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="NStack">
+      <HintPath>..\..\..\Users\miguel\.nuget\packages\nstack.core\0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+    </Reference>
+    <Reference Include="NStack">
+      <HintPath>..\..\..\Users\miguel\.nuget\packages\nstack.core\0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Remove="Drivers\#ConsoleDriver.cs#" />
   </ItemGroup>