Merge branch 'develop' into interactive-licensegen
This commit is contained in:
commit
2c21e90804
|
@ -35,10 +35,10 @@ First, we need to add the correct version of Newtonsoft.Json to the license gene
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd BitBetter/src/licenseGen/
|
cd BitBetter/src/licenseGen/
|
||||||
dotnet add package Newtonsoft.Json --version 11.0.0
|
dotnet add package Newtonsoft.Json --version 12.0.1
|
||||||
|
|
||||||
cd ../bitBetter
|
cd ../bitBetter
|
||||||
dotnet add package Newtonsoft.Json --version 11.0.0
|
dotnet add package Newtonsoft.Json --version 12.0.1
|
||||||
```
|
```
|
||||||
## Building BitBetter
|
## 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>
|
First, from the `BitBetter` directory, **build the license generator**.<sup>[2](#f2)</sup>
|
||||||
|
|
||||||
```bash
|
```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/).
|
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/).
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
|
<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" />
|
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue