Skip to content

Commit

Permalink
Merge pull request #216 from icsharpcode/version61builds
Browse files Browse the repository at this point in the history
Set version to 6.1-p1
  • Loading branch information
christophwille authored Feb 4, 2020
2 parents 1806ad4 + c215d94 commit e9df2d9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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}'

Expand Down
5 changes: 3 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -41,7 +42,7 @@ steps:
WriteBOM: false
VersionNumber: '$(buildVersion)'
FileVersionNumber: '$(buildVersion)'
PackageVersion: '$(buildVersion)'
PackageVersion: '$(nupkgVersion)'

- task: VSBuild@1
inputs:
Expand Down

0 comments on commit e9df2d9

Please sign in to comment.