Skip to content

Commit

Permalink
Prepare 6.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
christophwille committed Dec 10, 2022
1 parent b6fe189 commit 78656fc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -71,15 +71,15 @@ 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
if-no-files-found: error

- 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
Expand Down
6 changes: 5 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Company>ic#code</Company>
<Copyright>2000-2022 AlphaSierraPapa for the SharpDevelop Team</Copyright>
<Description>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.</Description>
<Version>6.1</Version>
<AssemblyVersion>6.1.0.0</AssemblyVersion>
<FileVersion>6.1.0.0</FileVersion>
<Version>6.2</Version>
<AssemblyVersion>6.2.0.0</AssemblyVersion>
<FileVersion>6.2.0.0</FileVersion>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

Expand Down
7 changes: 4 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"sdk": {
"version": "6.0.100",
"rollForward": "latestFeature"
"version": "6.0.200",
"rollForward": "major",
"allowPrerelease": true
}
}
}

0 comments on commit 78656fc

Please sign in to comment.