diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4159f979..5e288d24 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,9 +16,9 @@ jobs: env: Solution: '**/ICSharpCode.AvalonEdit.sln' BuildPlatform: 'Any CPU' - BuildVersion: '6.1.4' + BuildVersion: '6.2.0' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update project version uses: roryprimrose/set-vs-sdk-project-version@v1 with: @@ -28,12 +28,12 @@ jobs: fileVersion: ${{ env.BuildVersion }}.${{ github.run_number }} - name: Setup .NET 3.1 (for unit tests only) - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: 3.1.x - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x @@ -71,7 +71,7 @@ jobs: - name: Upload NuGet if: matrix.configuration == 'release' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: AvalonEdit NuGet Package (${{ matrix.configuration }}) path: ICSharpCode.AvalonEdit/bin/Release/AvalonEdit*.nupkg @@ -79,7 +79,7 @@ jobs: - name: Upload Snupkg Artifact if: matrix.configuration == 'release' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: AvalonEdit Snupkg (${{ matrix.configuration }}) path: ICSharpCode.AvalonEdit/bin/Release/AvalonEdit*.snupkg diff --git a/ChangeLog.md b/ChangeLog.md index c529843f..9ec60c99 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,7 +1,11 @@ Note: this changelog only lists major changes and fixes for major bugs. For a complete list of changes, see the git log. -tbd: AvalonEdit X +tbd: AvalonEdit XML +* tbd + +2022/12/10: AvalonEdit 6.2.0 * Change framework targets to .NET Framework 4.6.2, .NET Core 3.1 and .NET 6.0 (.NET Framework 4.0, 4.5 and .NET 5.0 removed) +* Minor bug fixes 2021/12/28: AvalonEdit 6.1.3 * TFM changes: net6.0-windows (LTS) added diff --git a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj index f7ceb98e..019526db 100644 --- a/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj +++ b/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj @@ -10,9 +10,9 @@ ic#code 2000-2022 AlphaSierraPapa for the SharpDevelop Team AvalonEdit is the WPF-based text editor used in SharpDevelop. There are five builds of AvalonEdit included in this package: .NET Framework 4.5 and 4.0, .NET Core 3.1, .NET 5.0 for Windows, .NET 6.0 for Windows. - 6.1 - 6.1.0.0 - 6.1.0.0 + 6.2 + 6.2.0.0 + 6.2.0.0 True diff --git a/global.json b/global.json index 10b65be8..68d9ecef 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "6.0.100", - "rollForward": "latestFeature" + "version": "6.0.200", + "rollForward": "major", + "allowPrerelease": true } -} +} \ No newline at end of file