Skip to content

Commit

Permalink
Merge pull request #1356 from qdraw/feature/202401-docs-31
Browse files Browse the repository at this point in the history
update docs
  • Loading branch information
qdraw authored Jan 31, 2024
2 parents 377b7fe + f92b471 commit d3e204f
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 146 deletions.
12 changes: 6 additions & 6 deletions documentation/docs/developer-guide/logging/opentelemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ The following settings can be used:

use for example this file name: appsettings.machinename.json

### Order of appsettings patch files
### Order of appSettings patch files

1. You can use `appsettings.json` inside the application folder to set base settings.
The order of this files is used to get the values from the appsettings
- `/bin/Debug/net6.0/appsettings.patch.json`
- `/bin/Debug/net6.0/appsettings.default.json`
- `/bin/Debug/net6.0/appsettings.computername.patch.json`
- `/bin/Debug/net6.0/appsettings.json`
- `/bin/Debug/net6.0/appsettings.computername.json`
- `/bin/Debug/net8.0/appsettings.patch.json`
- `/bin/Debug/net8.0/appsettings.default.json`
- `/bin/Debug/net8.0/appsettings.computername.patch.json`
- `/bin/Debug/net8.0/appsettings.json`
- `/bin/Debug/net8.0/appsettings.computername.json`

```json
{
Expand Down
7 changes: 3 additions & 4 deletions starsky-tools/build-tools/dotnet-sdk-version-update.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ getLatestDotnetRelease().then((newTargetVersion) => {

const frameworkMonikerByPath = await updateNugetPackageVersions(
sortedFilterPathList,
newRunTimeVersion
);

const refFrameworkMonikerByPath =
Expand Down Expand Up @@ -285,7 +284,7 @@ function replaceMcrFileContent(fileContent, what, sdkResult) {
}

async function getByBlobMicrosoft(targetVersion, isRuntime) {
var what = "latest-sdk";
let what = "latest-sdk";
if (isRuntime) what = "latest-runtime";

const resultsDotnetCli = await httpsGet(
Expand Down Expand Up @@ -385,7 +384,7 @@ async function updateAzureYmlFile(filePathList, sdkVersion) {
let buffer = await readFile(filePath);
let fileContent = buffer.toString("utf8");

var taskUseDotNetRegex = new RegExp("task: UseDotNet@2", "g");
let taskUseDotNetRegex = new RegExp("task: UseDotNet@2", "g");

const taskUseDotNetMatch = taskUseDotNetRegex.exec(fileContent);

Expand Down Expand Up @@ -794,7 +793,7 @@ async function updateNugetPackageVersions(filePathList) {

async function updateSingleNugetPackageVersion(filePath) {
let usedTargetFrameworkMonikers = [];
// '///starsky/starsky.foundation.consoletelemetry/starsky.foundation.consoletelemetry.csproj': [ 'net6.0', 'netstandard2.0', 'netstandard2.1' ],
// '///starsky/starsky.foundation.consoletelemetry/starsky.foundation.consoletelemetry.csproj': [ 'net8.0', 'netstandard2.0', 'netstandard2.1' ],

if (filePath.endsWith(".csproj")) {
let buffer = await readFile(filePath);
Expand Down
2 changes: 1 addition & 1 deletion starsky/starsky/cleanup-build-tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

param(
[Parameter(Mandatory=$false)][switch]$help,
[Parameter(Mandatory=$false)][string]$netMoniker='net6.0',
[Parameter(Mandatory=$false)][string]$netMoniker='net8.0',
[Parameter(Mandatory=$false)][string]$solutionName='starsky.sln'
)

Expand Down
2 changes: 1 addition & 1 deletion starsky/starsky/cleanup-build-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# docker system prune -a -f

SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
NET_MONIKER="net6.0"
NET_MONIKER="net8.0"

if [ -d $HOME"/.sonar" ]
then
Expand Down
50 changes: 0 additions & 50 deletions starsky/starsky/gatekeeper-mac-os-helper.command

This file was deleted.

16 changes: 8 additions & 8 deletions starsky/starsky/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ The command line arguments are shortcuts to set an in-app environment variable.
You could use machine specific configuration files: appsettings.machinename.json _(and replace machinename with your computer name in lowercase)_
1. You can use `appsettings.json` inside the application folder to set base settings.
The order of this files is used to get the values from the appsettings
- `/bin/Debug/net6.0/appsettings.patch.json`
- `/bin/Debug/net6.0/appsettings.default.json`
- `/bin/Debug/net6.0/appsettings.computername.patch.json`
- `/bin/Debug/net6.0/appsettings.json`
- `/bin/Debug/net6.0/appsettings.computername.json`
- `/bin/Debug/net8.0/appsettings.patch.json`
- `/bin/Debug/net8.0/appsettings.default.json`
- `/bin/Debug/net8.0/appsettings.computername.patch.json`
- `/bin/Debug/net8.0/appsettings.json`
- `/bin/Debug/net8.0/appsettings.computername.json`

2. Use Environment variables to overwrite those base settings
For `ThumbnailTempFolder` use `app__ThumbnailTempFolder`
Expand All @@ -45,10 +45,10 @@ You could use machine specific configuration files: appsettings.machinename.json
1. To start it is __not__ mandatory to adjust any settings.

### Recommend settings
1. `ThumbnailTempFolder` - For storing thumbnails (default: `./bin/Debug/net6.0/thumbnailTempFolder`)
2. `StorageFolder` - For the main photo directory (default: `./bin/Debug/net6.0/storageFolder`)
1. `ThumbnailTempFolder` - For storing thumbnails (default: `./bin/Debug/net8.0/thumbnailTempFolder`)
2. `StorageFolder` - For the main photo directory (default: `./bin/Debug/net8.0/storageFolder`)
3. `DatabaseType` - `mysql`, `sqlite` or `inmemorydatabase` are supported (default: `sqlite`)
4. `DatabaseConnection` - The connection-string to the database (default: `./bin/Debug/net6.0/data.db`)
4. `DatabaseConnection` - The connection-string to the database (default: `./bin/Debug/net8.0/data.db`)
5. `CameraTimeZone` - The timezone of the Camera, for example `Europe/Amsterdam` (defaults to your local timezone)

### Optional settings
Expand Down
Loading

0 comments on commit d3e204f

Please sign in to comment.