From 87b0cbc258f4f8d59f33818bf50f945be91ebb13 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Tue, 4 Feb 2020 16:24:57 +0100
Subject: [PATCH 1/2] Set version to 6.1-p1

---
 ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj | 10 +++++-----
 appveyor.yml                                         |  4 ++--
 azure-pipelines.yml                                  |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index 04ae0973..db824408 100644
--- a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -9,11 +9,11 @@
     <AssemblyOriginatorKeyFile>ICSharpCode.AvalonEdit.snk</AssemblyOriginatorKeyFile>
     <DocumentationFile>ICSharpCode.AvalonEdit.xml</DocumentationFile>
     <Company>ic#code</Company>
-    <Copyright>2000-2019 AlphaSierraPapa for the SharpDevelop Team</Copyright>
+    <Copyright>2000-2020 AlphaSierraPapa for the SharpDevelop Team</Copyright>
     <Description>AvalonEdit is the WPF-based text editor used in SharpDevelop. There are three builds of AvalonEdit included in this package: .NET 4.0, 4.5 and .NET Core 3.0.</Description>
-    <Version>6.0</Version>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <FileVersion>6.0.0.0</FileVersion>
+    <Version>6.1</Version>
+    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <FileVersion>6.1.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -63,7 +63,7 @@
     <EmbeddedResource Include="Highlighting\Resources\*" />
     <EmbeddedResource Remove="Highlighting\Resources\Resources.cs" />
     <Resource Include="Highlighting\Resources\Resources.cs" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/appveyor.yml b/appveyor.yml
index 51f9a3ff..b5f69025 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,9 @@
-version: '6.0.1.{build}'
+version: '6.1.0.{build}'
 
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '6.0.1'
+  version: '6.1.0-preview1'
   assembly_version: '{version}'
   file_version: '{version}'
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d009f73e..9d816e8f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,8 @@ pr:
 variables:
   solution: '**/ICSharpCode.AvalonEdit.sln'
   buildPlatform: 'Any CPU'
-  buildVersion: '6.0.1.$(Build.BuildId)'
+  buildVersion: '6.1.0.$(Build.BuildId)'
+  nupkgVersion: '6.1.0-preview1'
 
 pool:
   vmImage: 'windows-2019'

From c215d94e84911eebde53c31698720c66e1bde036 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Tue, 4 Feb 2020 16:27:06 +0100
Subject: [PATCH 2/2] Use new variable for packaging

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9d816e8f..79945f09 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,7 +42,7 @@ steps:
     WriteBOM: false
     VersionNumber: '$(buildVersion)'
     FileVersionNumber: '$(buildVersion)'
-    PackageVersion: '$(buildVersion)'
+    PackageVersion: '$(nupkgVersion)'
 
 - task: VSBuild@1
   inputs: