Merge branch 'develop' into interactive-licensegen

This commit is contained in:
Jeff Alyanak 2019-05-29 14:08:59 -04:00
commit 2c21e90804
No known key found for this signature in database
GPG Key ID: DD0CB89C105B276F
2 changed files with 4 additions and 4 deletions

View File

@ -35,10 +35,10 @@ First, we need to add the correct version of Newtonsoft.Json to the license gene
```bash
cd BitBetter/src/licenseGen/
dotnet add package Newtonsoft.Json --version 11.0.0
dotnet add package Newtonsoft.Json --version 12.0.1
cd ../bitBetter
dotnet add package Newtonsoft.Json --version 11.0.0
dotnet add package Newtonsoft.Json --version 12.0.1
```
## Building BitBetter
@ -85,7 +85,7 @@ There is a tool included in the directory `src/licenseGen/` that will generate n
First, from the `BitBetter` directory, **build the license generator**.<sup>[2](#f2)</sup>
```bash
./src/licenseGen/build.sh
./build.sh
```
In order to run the tool and generate a license you'll need to get a **user's GUID** in order to generate an **invididual license** or the server's **install ID** to generate an **Organization license**. These can be retrieved most easily through the Bitwarden [Admin Portal](https://help.bitwarden.com/article/admin-portal/).

View File

@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup>