Merge branch 'master' into feature/202402_rm_app_insights_direct

# Conflicts: # starsky/starsky.foundation.consoletelemetry/starsky.foundation.consoletelemetry.csproj # starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj
qdraw · Feb 6, 2024 · 1534ac4 · 1534ac4
2 parents e5c77f4 + 32e12ee
commit 1534ac4
Show file tree

Hide file tree

Showing 126 changed files with 2,118 additions and 1,100 deletions.
diff --git a/documentation/package.json b/documentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starsky",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

diff --git a/documentation/static/openapi/openapi.json b/documentation/static/openapi/openapi.json
@@ -1,7 +1,7 @@
 {
   "info": {
     "title": "Starsky",
-    "version": "0.5.14.0",
+    "version": "0.6.0.0",
     "extensions": {}
   },
   "servers": [

diff --git a/starsky-tools/build-tools/app-version-update.js b/starsky-tools/build-tools/app-version-update.js
@@ -6,12 +6,12 @@
 
 // other script: use release-version-check.js to check if the version is correct based on the branch name in the CI
 
-const { join } = require("path");
-const { readFile, writeFile } = require("fs").promises;
-const { getFiles } = require("./lib/get-files-directory");
-const { prefixPath } = require("./lib/prefix-path.const.js");
+const {join} = require("path");
+const {readFile, writeFile} = require("fs").promises;
+const {getFiles} = require("./lib/get-files-directory");
+const {prefixPath} = require("./lib/prefix-path.const.js");
 
-let newVersion = "0.5.14";
+let newVersion = "0.6.0-beta.0";
 
 // allow version as single argument
 const argv = process.argv.slice(2);

diff --git a/starsky-tools/build-tools/clientapp-vite-update.js b/starsky-tools/build-tools/clientapp-vite-update.js
@@ -1,9 +1,9 @@
 #!/usr/bin/node
 
-const { spawnSync } = require("child_process");
+const {spawnSync} = require("child_process");
 const fs = require("fs");
 const path = require("path");
-const { exit } = require("process");
+const {exit} = require("process");
 
 const clientAppFolderPath = path.join(
 	__dirname,
@@ -74,7 +74,7 @@ function getNpxCreateCreateApp() {
 
 	const updateSpawn = spawnSync(
 		"npm",
-		["create", "-y", "vite@latest" , myAppName, ,"--", "--template", "react-ts"],
+		["create", "-y", "vite@latest", myAppName, , "--", "--template", "react-ts"],
 		{
 			cwd: createReactTempFolder,
 			env: process.env,
@@ -154,7 +154,7 @@ fs.writeFileSync(
 function npmCi() {
 	console.log(
 		"run > npm ci --no-audit --legacy-peer-deps | in: " +
-			clientAppFolderPath
+		clientAppFolderPath
 	);
 	const npmCiOne = spawnSync(
 		"npm",
@@ -222,14 +222,14 @@ function npmInstall(packageName, force, dev) {
 	}
 	console.log(
 		"npm" +
-			" " +
-			"install --no-audit" +
-			" " +
-			packageName +
-			" " +
-			saveText +
-			" " +
-			forceText
+		" " +
+		"install --no-audit" +
+		" " +
+		packageName +
+		" " +
+		saveText +
+		" " +
+		forceText
 	);
 	const npmInstallSpawn = spawnSync(
 		"npm",
@@ -277,14 +277,14 @@ npmInstall('storybook', false, true);
 npmInstall('@storybook/addon-essentials', false, true);
 npmInstall('@storybook/addon-interactions', false, true);
 npmInstall('@storybook/addon-links', false, true);
-npmInstall('@storybook/blocks', false, true);
+// @storybook/blocks is skipped
 npmInstall('@storybook/builder-vite', false, true);
 npmInstall('@storybook/react', false, true);
 npmInstall('@storybook/react-vite', false, true);
-npmInstall('@storybook/testing-library', false, true);
+// @storybook/testing-library is skipped
 npmInstall('@testing-library/jest-dom', false, true);
 npmInstall('@testing-library/react', false, true);
-npmInstall('@testing-library/user-event', false, true);
+// @testing-library/user-event is skipped
 
 console.log("npm install result:");
 const npmInstallSpawnResult = spawnSync(

diff --git a/starsky-tools/build-tools/package.json b/starsky-tools/build-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-tools",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "",
   "scripts": {
@@ -9,6 +9,7 @@
     "clientapp-vite-update": "node clientapp-vite-update",
     "documentation-create-docusaurus-update": "node documentation-create-docusaurus-update",
     "app-version-update": "node app-version-update.js",
+    "app-version-test": "node app-version-test.js",
     "project-guid": "node project-guid.js",
     "nuget-package-list": "node nuget-package-list.js",
     "release-version-check": "node release-version-check.js",

diff --git a/starsky-tools/dropbox-import/package.json b/starsky-tools/dropbox-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dropbox-import",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "dropbox-import.js",
   "scripts": {

diff --git a/starsky-tools/end2end/package.json b/starsky-tools/end2end/package.json
@@ -1,6 +1,6 @@
 {
   "name": "end2end",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "End2End testing of the application",
   "scripts": {
     "start": "cypress open --env configFolder=starsky,configEnv=local,CYPRESS_RETRIES=2 --e2e --browser=electron",

diff --git a/starsky-tools/localtunnel/package.json b/starsky-tools/localtunnel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "localtunnel-project",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "localtunnel.js",
   "scripts": {

diff --git a/starsky-tools/mail/package.json b/starsky-tools/mail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mail",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "mail.js",
   "scripts": {

diff --git a/starsky-tools/mock/package.json b/starsky-tools/mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mock",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "mock.js",
   "scripts": {

diff --git a/starsky-tools/slack-notification/package.json b/starsky-tools/slack-notification/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slack-notifications",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "",
   "scripts": {

diff --git a/starsky-tools/sync/package.json b/starsky-tools/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starsky-tools",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/starsky-tools/thumbnail/package.json b/starsky-tools/thumbnail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thumbnail",
-  "version": "0.5.14",
+  "version": "0.6.0-beta.0",
   "description": "Client side thumbnail generation interacting with a Starsky WebApi ",
   "main": "thumbnail.js",
   "scripts": {

diff --git a/starsky/starsky.feature.demo/starsky.feature.demo.csproj b/starsky/starsky.feature.demo/starsky.feature.demo.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <!-- SonarQube needs this -->
     <ProjectGuid>{34d46dc0-f965-46bf-9178-b83a9a6627e7}</ProjectGuid>
-    <Version>0.5.14</Version>
+    <Version>0.6.0-beta.0</Version>
     <Nullable>enable</Nullable>
     <RootNamespace>starsky.feature.demo</RootNamespace>
 

diff --git a/starsky/starsky.feature.export/starsky.feature.export.csproj b/starsky/starsky.feature.export/starsky.feature.export.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <ProjectGuid>{09ccbfa9-612f-4d5e-ae27-c0c06e7114c9}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.geolookup/starsky.feature.geolookup.csproj b/starsky/starsky.feature.geolookup/starsky.feature.geolookup.csproj
@@ -6,7 +6,7 @@
         <ProjectGuid>{23e26a58-29c5-4d0c-813b-9f7bd991b107}</ProjectGuid>
         <RootNamespace>starsky.feature.geolookup</RootNamespace>
         <DebugType>Full</DebugType>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ProjectGuid>{d9c8e6e0-2526-4978-ad8c-b4e74993cfd8}</ProjectGuid>
         <RootNamespace>starsky.feature.health</RootNamespace>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.import/starsky.feature.import.csproj b/starsky/starsky.feature.import/starsky.feature.import.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <!-- SonarQube needs this -->
         <ProjectGuid>{e9c60bf0-09b6-40c9-95b5-25c7a185365e}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.metaupdate/starsky.feature.metaupdate.csproj b/starsky/starsky.feature.metaupdate/starsky.feature.metaupdate.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>starsky.feature.metaupdate</RootNamespace>
         <ProjectGuid>{9567d576-4dee-481b-b316-c55d493416f4}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.packagetelemetry/starsky.feature.packagetelemetry.csproj b/starsky/starsky.feature.packagetelemetry/starsky.feature.packagetelemetry.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>starsky.feature.packagetelemetry</RootNamespace>
     <ProjectGuid>{6fbad8a6-53fa-41d2-98a4-61eb46d70794}</ProjectGuid>
-    <Version>0.5.14</Version>
+    <Version>0.6.0-beta.0</Version>
     <Nullable>enable</Nullable>
 </PropertyGroup>
 

diff --git a/starsky/starsky.feature.realtime/starsky.feature.realtime.csproj b/starsky/starsky.feature.realtime/starsky.feature.realtime.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>starsky.feature.realtime</RootNamespace>
     <ProjectGuid>{4a749ec1-4e6d-4c68-b69c-00c5c80f5660}</ProjectGuid>
-    <Version>0.5.14</Version>
+    <Version>0.6.0-beta.0</Version>
     <Nullable>enable</Nullable>
 </PropertyGroup>
 

diff --git a/starsky/starsky.feature.rename/starsky.feature.rename.csproj b/starsky/starsky.feature.rename/starsky.feature.rename.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <ProjectGuid>{a864f834-133f-4ea8-9a4d-53e5cad837ab}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.search/starsky.feature.search.csproj b/starsky/starsky.feature.search/starsky.feature.search.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <!-- SonarQube needs this -->
         <ProjectGuid>{c9e6cec6-c453-4c61-a955-ec65765afe0a}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <Nullable>enable</Nullable>
         <RootNamespace>starsky.feature.search</RootNamespace>
     </PropertyGroup>

diff --git a/starsky/starsky.feature.settings/starsky.feature.settings.csproj b/starsky/starsky.feature.settings/starsky.feature.settings.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <ProjectGuid>{67a8a132-6551-4042-96a4-3ec507b0cb83}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/starsky/starsky.feature.syncbackground/starsky.feature.syncbackground.csproj b/starsky/starsky.feature.syncbackground/starsky.feature.syncbackground.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>starsky.feature.syncbackground</RootNamespace>
     <ProjectGuid>{15e1493e-6e79-4314-907f-b3ef18eb9046}</ProjectGuid>
-    <Version>0.5.14</Version>
+    <Version>0.6.0-beta.0</Version>
     <Nullable>enable</Nullable>
 </PropertyGroup>
 

diff --git a/starsky/starsky.feature.thumbnail/starsky.feature.thumbnail.csproj b/starsky/starsky.feature.thumbnail/starsky.feature.thumbnail.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>starsky.feature.thumbnail</RootNamespace>
         <ProjectGuid>{93a6019f-6627-483e-a18e-0d073d7b0883}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/starsky/starsky.feature.trash/starsky.feature.trash.csproj b/starsky/starsky.feature.trash/starsky.feature.trash.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>starsky.feature.trash</RootNamespace>
         <ProjectGuid>{21affb47-1f8c-458a-84bb-24959e0fda31}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/starsky/starsky.feature.webftppublish/starsky.feature.webftppublish.csproj b/starsky/starsky.feature.webftppublish/starsky.feature.webftppublish.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <!-- SonarQube needs this -->
         <ProjectGuid>{31df1419-6c81-4372-b7ae-a6ebb429e7e9}</ProjectGuid>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj b/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj
@@ -6,7 +6,7 @@
         <!-- SonarQube needs this -->
         <ProjectGuid>{7f7fe502-31a8-409b-bd0b-92d7d1bfeb31}</ProjectGuid>
         <DebugType>Full</DebugType>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj
@@ -5,7 +5,7 @@
         <!-- SonarQube needs this -->
         <ProjectGuid>{842d2080-b847-43c3-8535-e5065970dd47}</ProjectGuid>
         <RootNamespace>starsky.foundation.accountmanagement</RootNamespace>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/starsky/starsky.foundation.consoletelemetry/starsky.foundation.consoletelemetry.csproj b/starsky/starsky.foundation.consoletelemetry/starsky.foundation.consoletelemetry.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <!-- SonarQube needs this -->
+        <ProjectGuid>{9402eb61-ae4c-4e8b-8413-c47573d16c9d}</ProjectGuid>
+        <DebugType>Full</DebugType>
+        <Version>0.6.0-beta.0</Version>
+        <RootNamespace>starsky.foundation.consoletelemetry</RootNamespace>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\starsky.foundation.platform\starsky.foundation.platform.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    </ItemGroup>
+
+</Project>
diff --git a/starsky/starsky.foundation.database/starsky.foundation.database.csproj b/starsky/starsky.foundation.database/starsky.foundation.database.csproj
@@ -6,7 +6,7 @@
         <ProjectGuid>{46588bf9-d745-460d-a22d-d8fdfc698809}</ProjectGuid>
         <DebugType>Full</DebugType>
         <DefineConstants>T</DefineConstants>
-        <Version>0.5.14</Version>
+        <Version>0.6.0-beta.0</Version>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj b/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <!-- SonarQube needs this -->
+        <ProjectGuid>{0697d621-f50c-430b-9a41-9a9992d63a2b}</ProjectGuid>
+        <DebugType>Full</DebugType>
+        <Version>0.6.0-beta.0</Version>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
+      <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\starsky.foundation.platform\starsky.foundation.platform.csproj" />
+    </ItemGroup>
+
+</Project>