From 1f3cb2c0768f4900aa927b1bc3fc3b4affb5ee73 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Tue, 24 Sep 2019 17:31:56 +0200
Subject: [PATCH] Update to AvalonEdit 6.0 RTM Update AppVeyor script to no
 longer install netcore3 SDK (VS 16.3 includes that) Set global.json to
 netcore3 RTM

---
 ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj | 2 +-
 ILSpy/ILSpy.csproj                               | 2 +-
 appveyor.yml                                     | 2 --
 global.json                                      | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
index ee81f61fd..7d1208b65 100644
--- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.0.0-rc1" />
+    <PackageReference Include="AvalonEdit" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 072b2c3ea..1dd22579f 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.0.0-rc1" />
+    <PackageReference Include="AvalonEdit" Version="6.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.5.23" />
     <PackageReference Include="Mono.Cecil" Version="0.10.3" />
     <PackageReference Include="OSVersionHelper" Version="1.0.11" />
diff --git a/appveyor.yml b/appveyor.yml
index c3efe5a38..49c50f75c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,6 @@ configuration:
 image: Visual Studio 2019
 
 install:
-- cmd: choco install dotnetcore-sdk --pre
 - git submodule update --init --recursive
 - ps: .\BuildTools\appveyor-install.ps1
 
@@ -43,7 +42,6 @@ for:
 - branches:
     only:
       - master
-      - 3.2.x
   artifacts:
     - path: ILSpy_binaries.zip
       name: ILSpy %APPVEYOR_REPO_BRANCH% %ILSPY_VERSION_NUMBER% binaries
diff --git a/global.json b/global.json
index 05c896433..6ba836210 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
 		"MSBuild.Sdk.Extras": "2.0.24"
 	},
 	"sdk": {
-		"version": "3.0.100-rc1"
+		"version": "3.0.100"
 	}
 }