Skip to content

Commit

Permalink
versioning, switch to dotnet-standard
Browse files Browse the repository at this point in the history
  • Loading branch information
MadMonkey87 committed Jan 19, 2019
1 parent a2824c8 commit f98b2f8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>Philippe Wechsler</Authors>
<Company>InnerCore</Company>
<Description>A simple library to communicate with DeConz Zigbee Gateway</Description>
Expand Down
4 changes: 2 additions & 2 deletions InnerCore.Api.DeConz/InnerCore.Api.DeConz.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>Philippe Wechsler</Authors>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Company>InnerCore</Company>
<Version>0.5.0</Version>
<Version>1.0.0</Version>
<RepositoryUrl>https://github.com/MadMonkey87/InnerCore.Api.DeConz</RepositoryUrl>
<PackageProjectUrl>https://github.com/MadMonkey87/InnerCore.Api.DeConz</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/MadMonkey87/InnerCore.Api.DeConz/blob/master/LICENSE.txt</PackageLicenseUrl>
Expand Down
6 changes: 3 additions & 3 deletions InnerCore.Api.DeConz/InnerCore.Api.DeConz.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<package >
<metadata>
<id>InnerCore.Api.DeConz</id>
<version>0.5-beta</version>
<version>1.0</version>
<title>InnerCore.Api.DeConz</title>
<authors>Philippe Wechsler</authors>
<owners>Philippe Wechsler</owners>
<licenseUrl>https://github.com/MadMonkey87/InnerCore.Api.DeConz/blob/master/LICENSE.txt</licenseUrl>
<projectUrl>https://github.com/MadMonkey87/InnerCore.Api.DeConz</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A simple library to communicate with DeConz Zigbee Gateway</description>
<releaseNotes>password management, update firmware/software, scan/reset/identify devices</releaseNotes>
<releaseNotes>initial public release</releaseNotes>
<copyright>Copyright 2019 Philippe Wechsler</copyright>
<tags>deconz zigbee sensor</tags>
<repository type="GitHub" url="https://github.com/MadMonkey87/InnerCore.Api.DeConz" />
<dependencies>
<group targetFramework="netcoreapp2.2">
<group targetFramework="netstandard2.0">
<dependency id="Newtonsoft.Json" version="12.0.1" />
</group>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions InnerCore.Api.DeConz/Models/Bridge/ChangePasswordRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ namespace InnerCore.Api.DeConz.Models.Bridge
[DataContract]
public class ChangePasswordRequest
{
public ChangePasswordRequest(string usename, string oldPassword, string newPassword)
public ChangePasswordRequest(string username, string oldPassword, string newPassword)
{
UserName = usename;
UserName = username;

OldPasswordHash = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes($"{usename}:{oldPassword}"));
NewPasswordHash = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes($"{usename}:{newPassword}"));
OldPasswordHash = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes($"{username}:{oldPassword}"));
NewPasswordHash = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes($"{username}:{newPassword}"));
}

public ChangePasswordRequest(string oldPassword, string newPassword) : this(Constants.DEFAULT_USERNAME, oldPassword, newPassword)
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
InnerCore.Api.DeConz [![Build Status][azure build]][project] [![NuGet][nuget badge]][nuget package]
InnerCore.Api.DeConz [![Build Status][azure build]][project] [![NuGet][nuget badge]][nuget package] [![.NET Standard][dotnet-standard badge]][dotnet-standard doc]
====================

Open source library for communication with the Dresden Elektronik DeConz bridge.
Expand All @@ -11,10 +11,6 @@ Note however, that
- some objects might be missing some properties/features if they are not supported by DeConz
- some objects have additional properties/features specific to DeConz

requirements:
- dotnet core 2.2
- DeConz 2.05.54 or later (earlier versions might work too)

## State
The project is currently in it's alpha state:
- not all features have been tested (especially scenes, rules and schedules)
Expand Down Expand Up @@ -121,4 +117,6 @@ Contributions are welcome. Fork this repository and send a pull request if you h
[azure build]: https://innercore.visualstudio.com/InnerCore.Api.DeConz/_apis/build/status/InnerCore.Api.DeConz?branchName=master
[project]: https://github.com/MadMonkey87/InnerCore.Api.DeConz
[nuget badge]: https://img.shields.io/nuget/v/InnerCore.Api.DeConz.svg
[nuget package]: https://www.nuget.org/packages/InnerCore.Api.DeConz
[nuget package]: https://www.nuget.org/packages/InnerCore.Api.DeConz
[dotnet-standard badge]: http://img.shields.io/badge/.NET_Standard-v2.0-green.svg
[dotnet-standard doc]: https://docs.microsoft.com/da-dk/dotnet/articles/standard/library

0 comments on commit f98b2f8

Please sign in to comment.