diff --git a/Wonky.Client.SDK8.sln b/Wonky.Client.sln similarity index 100% rename from Wonky.Client.SDK8.sln rename to Wonky.Client.sln diff --git a/Wonky.Client.SDK8.sln.DotSettings b/Wonky.Client.sln.DotSettings similarity index 100% rename from Wonky.Client.SDK8.sln.DotSettings rename to Wonky.Client.sln.DotSettings diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 0e4f4d80..961424e9 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -20,25 +20,24 @@ {
RC
} - @if (_production) { -
build v.@_app?.Version
+
v.@_app?.Version
} else { -
build v.@_app?.Version
+
v.@_app?.Version
} -
@_app!.Sdk
- -@* -@if (_app!.Sandbox) +@if (_app!.Rc) { -
EDU SANDKASSE
+
RC
} -*@ - +
@_app!.Sdk
+@*@if (_app!.Sandbox) +{ +
EDU DEMO
+}*@ @code { [Inject] IOptions? AppInfo { get; set; } diff --git a/Wonky.Client/Components/InfoColorCustomerComponent.razor b/Wonky.Client/Components/InfoColorCustomerComponent.razor index 3e191139..0b73b6e1 100644 --- a/Wonky.Client/Components/InfoColorCustomerComponent.razor +++ b/Wonky.Client/Components/InfoColorCustomerComponent.razor @@ -40,7 +40,7 @@ Org. Nr. status - + diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 798bad28..69f4878c 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -5,20 +5,20 @@ enable latestmajor Exe - net8.0 + net7.0 - - - - - - - - + + + + + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 1793618a..e0454392 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -5,12 +5,12 @@ "rc": true, "sandBox": true, "image": "grumpy-coder.png", - "sdk": "dotnet 8.0 LTS" + "sdk": "dotnet 7.0" }, "Logging": { "LogLevel": { - "Default": "Debug", - "System": "Debug", + "Default": "None", + "System": "None", "Microsoft": "None" }, "Debug": { diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs index b3d0e42b..8b920b5d 100644 --- a/Wonky.Entity/Configuration/ApiConfig.cs +++ b/Wonky.Entity/Configuration/ApiConfig.cs @@ -200,4 +200,5 @@ public class ApiConfig /// Uri for warehouse requests /// public string Warehouse { get; set; } = ""; + } \ No newline at end of file diff --git a/Wonky.Entity/Configuration/AppInfo.cs b/Wonky.Entity/Configuration/AppInfo.cs index 48e3456c..1e8d4246 100644 --- a/Wonky.Entity/Configuration/AppInfo.cs +++ b/Wonky.Entity/Configuration/AppInfo.cs @@ -42,6 +42,10 @@ public class AppInfo /// Sandbox version /// public bool Sandbox { get; set; } - + + /// + /// active SDK + /// public string Sdk { get; set; } = ""; + } \ No newline at end of file diff --git a/Wonky.Entity/Wonky.Entity.csproj b/Wonky.Entity/Wonky.Entity.csproj index 30402ac0..cfadb03d 100644 --- a/Wonky.Entity/Wonky.Entity.csproj +++ b/Wonky.Entity/Wonky.Entity.csproj @@ -1,7 +1,7 @@ - net8.0 + net7.0 enable enable diff --git a/alpha-build.sh b/alpha-build.sh new file mode 100644 index 00000000..ae8830c0 --- /dev/null +++ b/alpha-build.sh @@ -0,0 +1,5 @@ +#/usr/bin/env bash + +dotnet publish -c release +rm -rf /a/projects/inno/version-sync/alpha-client/* +cp /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/* /a/projects/inno/version-sync/alpha-client/ -rn diff --git a/global.json b/global.json index dad2db5e..36e1a9e9 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.0", + "version": "7.0.0", "rollForward": "latestMajor", - "allowPrerelease": true + "allowPrerelease": false } } \ No newline at end of file