Merge pull request #870 from tig/test_deploy_89_1

another test

.github/workflows/dotnet-core.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 3.1.200
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      # - name: Setup dotnet
-      #   uses: actions/setup-dotnet@v1
-      #   with:
-      #     dotnet-version: 3.1.200
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.200
 
       # Publish
       - name: publish on version change
@@ -21,16 +21,16 @@ jobs:
         uses: rohith/publish-nuget@v2
         with:
           # Filepath of the project to be packaged, relative to root of repository
-          PROJECT_FILE_PATH: Core/Core.csproj
+          PROJECT_FILE_PATH: Terminal.Gui/Terminal.Gui.csproj
           
           # NuGet package id, used for version detection & defaults to project name
-          # PACKAGE_NAME: Core
+          PACKAGE_NAME: Terminal.Gui
           
           # Filepath with version info, relative to root of repository & defaults to PROJECT_FILE_PATH
-          # VERSION_FILE_PATH: Directory.Build.props
+          VERSION_FILE_PATH: Directory.Build.props
 
           # Regex pattern to extract version info in a capturing group
-          # VERSION_REGEX: ^\s*<Version>(.*)<\/Version>\s*$
+          VERSION_REGEX: ^\s*<Version>(.*)<\/Version>\s*$
           
           # Useful with external providers like Nerdbank.GitVersioning, ignores VERSION_FILE_PATH & VERSION_REGEX
           # VERSION_STATIC: 1.0.0
@@ -42,10 +42,10 @@ jobs:
           # TAG_FORMAT: v*
 
           # API key to authenticate with NuGet server
-          # NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
 
           # NuGet server uri hosting the packages, defaults to https://api.nuget.org
           # NUGET_SOURCE: https://api.nuget.org
 
           # Flag to toggle pushing symbols along with nuget package to the server, disabled by default
-          # INCLUDE_SYMBOLS: false
+          INCLUDE_SYMBOLS: true

Makefile

@@ -1,16 +0,0 @@
-all: doc-update yaml
-
-# Used to fetch XML doc updates from the C# compiler into the ECMA docs
-doc-update: Terminal.Gui/bin/Release/ne461/Terminal.Gui.dll
-	msbuild /p:Configuration=Release
-	mdoc update -i Terminal.Gui/bin/Release/net461/Terminal.Gui.xml -o ecmadocs/en Terminal.Gui/bin/Release/net461/Terminal.Gui.dll
-
-Terminal.Gui/bin/Release/ne461/Terminal.Gui.dll: 
-	(cd Terminal.Gui)
-	msbuild /p:Configuration=Release
-
-yaml:
-	-rm ecmadocs/en/ns-.xml
-	mono /cvs/ECMA2Yaml/ECMA2Yaml/ECMA2Yaml/bin/Debug/ECMA2Yaml.exe --source=`pwd`/ecmadocs/en --output=`pwd`/docfx/api
-	(cd docfx; mono ~/Downloads/docfx/docfx.exe build)
-

Terminal.Gui/Terminal.Gui.csproj

@@ -5,13 +5,15 @@
     <AssemblyName>Terminal.Gui</AssemblyName>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
-    <AssemblyVersion>0.89.0.0</AssemblyVersion>
+    <!-- moved to ../Directory.Build.props -->
+    <!-- <AssemblyVersion>0.89.0.0</AssemblyVersion> -->
   </PropertyGroup>
   <PropertyGroup>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <PackageId>Terminal.Gui</PackageId>
-    <PackageVersion>0.89</PackageVersion>
-    <Authors>Miguel de Icaza, Charlie Kindel (@tig), @BDisp</Authors>
+    <!-- moved to ../Directory.Build.props -->
+    <!-- <PackageVersion>0.89</PackageVersion> -->
+    <!-- <Authors>Miguel de Icaza, Charlie Kindel (@tig), @BDisp</Authors> -->
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/migueldeicaza/gui.cs/</PackageProjectUrl>
     <PackageTags>csharp, terminal, c#, f#, gui, toolkit, console</PackageTags>

XmlYamlMapping.json

@@ -1,60 +0,0 @@
-{
-  "/cvs/gui.cs/ecmadocs/en/ns-Mono.Terminal.xml": "/cvs/gui.cs/docfx/api/Mono.Terminal.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Clipboard.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Clipboard.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ProgressBar.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ProgressBar.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/SpecialChar.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.SpecialChar.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Button.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Button.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ScrollView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ScrollView.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/FileDialog.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.FileDialog.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Toplevel.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Toplevel.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Dialog.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Dialog.yml",
-  "/cvs/gui.cs/ecmadocs/en/Unix.Terminal/Curses+Event.xml": "/cvs/gui.cs/docfx/api/Unix.Terminal/Unix.Terminal.Curses.Event.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Attribute.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Attribute.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/OpenDialog.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.OpenDialog.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/CheckBox.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.CheckBox.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Size.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Size.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/TimeField.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.TimeField.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/IListDataSource.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.IListDataSource.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MenuBar.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MenuBar.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MouseEvent.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MouseEvent.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Dim.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Dim.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/HexView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.HexView.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Colors.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Colors.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/TextField.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.TextField.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/RadioGroup.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.RadioGroup.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/LayoutStyle.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.LayoutStyle.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Application+RunState.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Application.RunState.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Responder.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Responder.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/TextAlignment.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.TextAlignment.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/View.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.View.yml",
-  "/cvs/gui.cs/ecmadocs/en/Mono.Terminal/UnixMainLoop+Condition.xml": "/cvs/gui.cs/docfx/api/Mono.Terminal/Mono.Terminal.UnixMainLoop.Condition.yml",
-  "/cvs/gui.cs/ecmadocs/en/Mono.Terminal/IMainLoopDriver.xml": "/cvs/gui.cs/docfx/api/Mono.Terminal/Mono.Terminal.IMainLoopDriver.yml",
-  "/cvs/gui.cs/ecmadocs/en/Unix.Terminal/Curses+Window.xml": "/cvs/gui.cs/docfx/api/Unix.Terminal/Unix.Terminal.Curses.Window.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Label.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Label.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Point.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Point.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ListView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ListView.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/CursesDriver.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.CursesDriver.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MenuBarItem.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MenuBarItem.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MessageBox.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MessageBox.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/FrameView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.FrameView.yml",
-  "/cvs/gui.cs/ecmadocs/en/ns-Unix.Terminal.xml": "/cvs/gui.cs/docfx/api/Unix.Terminal.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ScrollBarView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ScrollBarView.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ColorScheme.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ColorScheme.yml",
-  "/cvs/gui.cs/ecmadocs/en/ns-Terminal.Gui.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Rect.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Rect.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Key.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Key.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MouseFlags.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MouseFlags.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/MenuItem.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.MenuItem.yml",
-  "/cvs/gui.cs/ecmadocs/en/Mono.Terminal/UnixMainLoop.xml": "/cvs/gui.cs/docfx/api/Mono.Terminal/Mono.Terminal.UnixMainLoop.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Pos.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Pos.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Application.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Application.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Window.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Window.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/SaveDialog.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.SaveDialog.yml",
-  "/cvs/gui.cs/ecmadocs/en/Unix.Terminal/Curses.xml": "/cvs/gui.cs/docfx/api/Unix.Terminal/Unix.Terminal.Curses.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/ConsoleDriver.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.ConsoleDriver.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/KeyEvent.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.KeyEvent.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/TextView.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.TextView.yml",
-  "/cvs/gui.cs/ecmadocs/en/Mono.Terminal/MainLoop.xml": "/cvs/gui.cs/docfx/api/Mono.Terminal/Mono.Terminal.MainLoop.yml",
-  "/cvs/gui.cs/ecmadocs/en/Terminal.Gui/Color.xml": "/cvs/gui.cs/docfx/api/Terminal.Gui/Terminal.Gui.Color.yml",
-  "/cvs/gui.cs/ecmadocs/en/Unix.Terminal/Curses+MouseEvent.xml": "/cvs/gui.cs/docfx/api/Unix.Terminal/Unix.Terminal.Curses.MouseEvent.yml"
-}

azure-pipelines.yml

@@ -1,26 +0,0 @@
-pool:
-  vmImage: 'Ubuntu 16.04'
-
-variables:
-  buildConfiguration: 'Release'
-
-steps:
-- script: |
-    msbuild /t:Restore Terminal.sln
-  displayName: Restore dependencies
-
-
-- script: |
-    if echo $BUILD_SOURCEBRANCH | grep /release/; then perl -pi -e "s/PackageVersion>.*</PackageVersion>${BUILD_SOURCEBRANCHNAME}</" Terminal.Gui/Terminal.Gui.csproj; fi
-  displayName: Update NuGet package version from branch name
-
-- script: |
-    msbuild /p:Configuration=Release Terminal.sln
-  displayName: Build
-
-- script: |
-    cp ./Terminal.Gui/bin/Release/Terminal.Gui.*.nupkg $BUILD_ARTIFACTSTAGINGDIRECTORY
-  displayName: Copy artifacts to staging directory
-
-- task: PublishBuildArtifacts@1
-  condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true))