From acc1c463080de345ec2e8f019cd30db0a8be8e49 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 9 Aug 2017 13:40:38 -0700 Subject: [PATCH 1/3] Remove CodeCov from README --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 621037e89e..9f16405726 100644 --- a/readme.md +++ b/readme.md @@ -1,9 +1,9 @@ # Avalonia -| Gitter Chat | Windows Build Status | Linux/Mac Build Status | Code Coverage | -|---|---|---|---| -| [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | [![codecov](https://codecov.io/gh/AvaloniaUI/Avalonia/branch/master/graph/badge.svg)](https://codecov.io/gh/AvaloniaUI/Avalonia) | +| Gitter Chat | Windows Build Status | Linux/Mac Build Status | +|---|---|---| +| [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android. From e5e3fb4b0f647d70d8e468d177946d3fe91b0d68 Mon Sep 17 00:00:00 2001 From: Matthijs ter Woord Date: Sat, 12 Aug 2017 19:06:14 +0200 Subject: [PATCH 2/3] Bump version, to make nightly builds appear newer. --- src/Shared/SharedAssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Shared/SharedAssemblyInfo.cs b/src/Shared/SharedAssemblyInfo.cs index 7d4061eb23..548a46dde4 100644 --- a/src/Shared/SharedAssemblyInfo.cs +++ b/src/Shared/SharedAssemblyInfo.cs @@ -14,6 +14,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: NeutralResourcesLanguage("en")] -[assembly: AssemblyVersion("0.5.1")] -[assembly: AssemblyFileVersion("0.5.1")] -[assembly: AssemblyInformationalVersion("0.5.1")] +[assembly: AssemblyVersion("0.5.2")] +[assembly: AssemblyFileVersion("0.5.2")] +[assembly: AssemblyInformationalVersion("0.5.2")] From 24911deebf430f1e5e16f261a15f25cf13f20b53 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 14 Aug 2017 15:14:04 -0500 Subject: [PATCH 3/3] Update ReactiveUI submodule --- .gitmodules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6e9b10efa4..f446fe421e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "src/Avalonia.ReactiveUI/src"] path = src/Avalonia.ReactiveUI/src - url = https://github.com/reactiveui/ReactiveUI.git + url = https://github.com/AvaloniaUI/ReactiveUI.git + branch = avalonia-snapshot [submodule "src/Avalonia.HtmlRenderer/external"] path = src/Avalonia.HtmlRenderer/external url = https://github.com/AvaloniaUI/HTML-Renderer.git