Skip to content

Commit

Permalink
Merge branch 'release/2.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
owoudenberg committed Jul 2, 2021
2 parents 0f1af87 + f0c992d commit 98e5b8f
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 19 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,17 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x


- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.x'

- name: Use GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
useConfigFile: true

- name: Restore dependencies
run: dotnet restore

Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220">
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
13 changes: 13 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
assembly-versioning-scheme: MajorMinor
assembly-file-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDeployment
branches:
feature:
tag: beta
pull-request:
tag: pr
release:
tag: prerelease
ignore:
sha: []
merge-message-formats: {}
1 change: 1 addition & 0 deletions src/Example/Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<ItemGroup>
<PackageReference Include="NAudio" Version="2.0.0" />
<PackageReference Remove="GitVersion.MsBuild" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Features:
</PackageDescription>
<AssemblyName>SoundTouch.Net.NAudioSupport</AssemblyName>
<RootNamespace>$(AssemblyName)</RootNamespace>
<PackageId>SoundTouch.Net.NAudioSupport.Core</PackageId>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/SoundTouch.Net/SoundTouchProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

using System;
using System.Diagnostics;
using System.Reflection;

using SoundTouch.Assets;

Expand Down Expand Up @@ -143,12 +144,12 @@ private SoundTouchProcessor(TimeStretch stretch)
/// <summary>
/// Gets the <c>SoundTouch</c> library version string.
/// </summary>
public static string VersionString => ThisAssembly.AssemblyInformationalVersion;
public static string VersionString => GitVersionInformation.InformationalVersion;

/// <summary>
/// Gets the <c>SoundTouch</c> library version Id.
/// </summary>
public static Version Version => new Version(ThisAssembly.AssemblyFileVersion);
public static Version Version => new Version(GitVersionInformation.AssemblySemFileVer);

/// <summary>
/// Gets the number of samples currently unprocessed.
Expand Down
15 changes: 0 additions & 15 deletions version.json

This file was deleted.

0 comments on commit 98e5b8f

Please sign in to comment.