From 00c5997daaa40f0ee73c8b7d7eccf7b4dfd04194 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Fri, 25 Oct 2019 16:43:04 -0400 Subject: [PATCH] Unify projects in SDK-style and PackageReference (#54) * Unify projects in SDK-style and PackageReference * Add a note on the known issue about dlls not being copied * Bump CI to a more recent stable version of Mono This adds support for .net472, the first version of .NET with full support for netstandard2.0 --- .travis.yml | 2 +- Designer/Designer.csproj | 55 +++++------------------------ Designer/Properties/AssemblyInfo.cs | 26 -------------- Designer/packages.config | 4 --- Example/Example.csproj | 51 ++++---------------------- Example/packages.config | 4 --- README.md | 12 +++++++ Terminal.Gui/Terminal.Gui.csproj | 10 +----- Terminal.Gui/packages.config | 5 --- packages.config | 4 --- 10 files changed, 29 insertions(+), 144 deletions(-) delete mode 100644 Designer/Properties/AssemblyInfo.cs delete mode 100644 Designer/packages.config delete mode 100644 Example/packages.config delete mode 100644 Terminal.Gui/packages.config delete mode 100644 packages.config diff --git a/.travis.yml b/.travis.yml index 3c2272959..32a026fbe 100644 --- a/.travis.yml +++ b/.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.4.1" +mono: "5.20.0" dotnet: "2.1.4" os: "osx" diff --git a/Designer/Designer.csproj b/Designer/Designer.csproj index a81a74d95..72cddf4bc 100644 --- a/Designer/Designer.csproj +++ b/Designer/Designer.csproj @@ -1,56 +1,17 @@ - - + - Debug - x86 - {1228D992-C801-49BB-839A-7BD28A3FFF0A} + net472 Exe - Designer - Designer - v4.6.1 - - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 + Terminal + Terminal true - x86 - - - true - bin\Release - prompt - 4 - true - x86 + AnyCPU;x86 + x86 - - - ..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll - - - ..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll - + - - + - - - {00F366F8-DEE4-482C-B9FD-6DB0200B79E5} - Terminal.Gui - - - - - - - \ No newline at end of file diff --git a/Designer/Properties/AssemblyInfo.cs b/Designer/Properties/AssemblyInfo.cs deleted file mode 100644 index 626785eed..000000000 --- a/Designer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Designer")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("${AuthorCopyright}")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Designer/packages.config b/Designer/packages.config deleted file mode 100644 index 1cb98166f..000000000 --- a/Designer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Example/Example.csproj b/Example/Example.csproj index 3f6523667..f1e193d5a 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -1,55 +1,18 @@ - - + - Debug - x86 - {B0A602CD-E176-449D-8663-64238D54F857} + net472 Exe Terminal Terminal - v4.6.1 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 true - x86 - - - true - bin\Release - prompt - 4 - bin\Release\Terminal.xml - true - x86 + AnyCPU;x86 + x86 + StandaloneExample\**\*.*;Terminal.Gui\**\*.* - - - ..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll - False - - - ..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll - + - + - - - {00F366F8-DEE4-482C-B9FD-6DB0200B79E5} - Terminal.Gui - - - - - - diff --git a/Example/packages.config b/Example/packages.config deleted file mode 100644 index b1ca06e9c..000000000 --- a/Example/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/README.md b/README.md index caa46939f..b9c2edba8 100644 --- a/README.md +++ b/README.md @@ -213,3 +213,15 @@ 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 + true +``` diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 3cd4d3831..18afec86f 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -9,7 +9,7 @@ true Terminal.Gui - 0.24 + 0.25 Miguel de Icaza MIT https://github.com/migueldeicaza/gui.cs/ @@ -69,14 +69,6 @@ - - - ..\..\..\Users\miguel\.nuget\packages\nstack.core\0.11.0\lib\netstandard1.5\NStack.dll - - - ..\..\..\Users\miguel\.nuget\packages\nstack.core\0.11.0\lib\netstandard1.5\NStack.dll - - diff --git a/Terminal.Gui/packages.config b/Terminal.Gui/packages.config deleted file mode 100644 index ac099afec..000000000 --- a/Terminal.Gui/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages.config b/packages.config deleted file mode 100644 index b1ca06e9c..000000000 --- a/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file