diff --git a/Example/Example.csproj b/Example/Example.csproj index e6f0933c4..389809912 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 32e7a024c..2ca4f7190 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 - 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0115 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index d3b7082d0..9e8d0565f 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index bd6d91962..c7a8d9998 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,13 +5,11 @@ - 1.14.0 - pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 $(Version) - 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branc0115 @@ -34,16 +32,20 @@ net472;netstandard2.1;net7.0 Terminal.Gui Terminal.Gui + true + + + - + @@ -103,11 +105,10 @@ true + upstream true + true + Embedded + Miguel de Icaza, Tig Kindel (@tig), @BDisp - - - - - \ No newline at end of file diff --git a/Terminal.sln b/Terminal.sln index 9af00ffe7..70bcb8343 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CONTRIBUTING.md = CONTRIBUTING.md .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml GitVersion.yml = GitVersion.yml + global.json = global.json .github\workflows\publish.yml = .github\workflows\publish.yml README.md = README.md testenvironments.json = testenvironments.json diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 4aaac8a5b..f583f8a01 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index a7efbdb63..180d087b5 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 TRACE diff --git a/global.json b/global.json index 2dd1c167e..cf0511e14 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk":{ - "version":"7.0.100", - "rollForward":"latestMajor" + "version":"7.0.200", + "rollForward":"latestMinor" } }