From ab0f644d257edf1653b8826b2b12cec6fa6310a0 Mon Sep 17 00:00:00 2001 From: Charlie Kindel Date: Sat, 15 Aug 2020 10:01:28 -0700 Subject: [PATCH] another test --- .github/workflows/dotnet-core.yml | 2 +- .github/workflows/publish.yml | 20 +++++------ Makefile | 16 --------- Terminal.Gui/Terminal.Gui.csproj | 8 +++-- XmlYamlMapping.json | 60 ------------------------------- azure-pipelines.yml | 26 -------------- 6 files changed, 16 insertions(+), 116 deletions(-) delete mode 100644 Makefile delete mode 100644 XmlYamlMapping.json delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index f734ea7b5..a81b5b83f 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ed6b0ba6d..16df5a5ec 100644 --- a/.github/workflows/publish.yml +++ b/.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>\s*$ + VERSION_REGEX: ^\s*(.*)<\/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 \ No newline at end of file + INCLUDE_SYMBOLS: true \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 3651a6cf4..000000000 --- a/Makefile +++ /dev/null @@ -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) - diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 519e7abd7..a0e2124a3 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,13 +5,15 @@ Terminal.Gui bin\Release\Terminal.Gui.xml true - 0.89.0.0 + + true Terminal.Gui - 0.89 - Miguel de Icaza, Charlie Kindel (@tig), @BDisp + + + MIT https://github.com/migueldeicaza/gui.cs/ csharp, terminal, c#, f#, gui, toolkit, console diff --git a/XmlYamlMapping.json b/XmlYamlMapping.json deleted file mode 100644 index d5fcee25a..000000000 --- a/XmlYamlMapping.json +++ /dev/null @@ -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" -} \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 3ccc9a2ac..000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -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>.*${BUILD_SOURCEBRANCHNAME}