Skip to content

Commit

Permalink
Merge a166bed into 65233a5
Browse files Browse the repository at this point in the history
  • Loading branch information
magnus-tretton37 committed Mar 20, 2019
2 parents 65233a5 + a166bed commit 494bc94
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Change Log

## master
## master

## 1.1.0 (2019-03-20)

**Features:**
- [#11](https://github.com/castle/castle-dotnet/pull/11) Allow optional `clientId` parameter in the call to GetDevices(), which will set each device's `IsCurrentDevice` property accordingly.
- [#16](https://github.com/castle/castle-dotnet/pull/16) Can get IP address from request headers when using `Castle.Context.FromHttpRequest()`, by providing the helper with a list of header names to look for.
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Releasing
=========

1. Create branch `release X.Y.Z`.
1. Create branch `release-X.Y.Z`.
2. Update package version for the `Castle.Sdk` project to the new version ("Version" in .csproj or Properties -> Package -> Package version in Visual Studio)
3. Update `CHANGELOG.md` for the impending release
4. `git commit -am "release X.Y.Z."` (where X.Y.Z is the new version)
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.Sdk/Castle.Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageProjectUrl>https://github.com/castle/castle-dotnet</PackageProjectUrl>
<RootNamespace>Castle</RootNamespace>
<Version>1.0.1</Version>
<Version>1.1.0</Version>
<Authors>Castle</Authors>
<Product>Castle .NET SDK</Product>
<Description>Castle SDK for C# / .NET</Description>
Expand Down

0 comments on commit 494bc94

Please sign in to comment.