revert to 7

This commit is contained in:
Frede Hundewadt 2023-06-20 08:08:25 +02:00
parent 6201ad4f56
commit c128095937
11 changed files with 36 additions and 27 deletions

View file

@ -20,25 +20,24 @@
{
<div class="badge text-bg-warning mx-2 pt-2">RC</div>
}
@if (_production)
{
<div class="badge text-bg-success mx-2 pt-2">build v.@_app?.Version</div>
<div class="badge text-bg-success mx-3">v.@_app?.Version</div>
}
else
{
<div class="badge text-bg-info mx-2 pt-2">build v.@_app?.Version</div>
<div class="badge text-bg-info mx-3">v.@_app?.Version</div>
}
<div class="badge text-bg-info mx-2 pt-2">@_app!.Sdk</div>
@*
@if (_app!.Sandbox)
@if (_app!.Rc)
{
<div class="badge text-bg-danger mx-2 pt-2">EDU SANDKASSE</div>
<div class="badge text-bg-warning mx-3">RC</div>
}
*@
<div class="badge text-bg-info mx-2 pt-2">@_app!.Sdk</div>
@*@if (_app!.Sandbox)
{
<div class="badge text-bg-danger mx-3">EDU DEMO</div>
}*@
@code
{
[Inject] IOptions<AppInfo?>? AppInfo { get; set; }

View file

@ -40,7 +40,7 @@
Org. Nr. status
</td>
</tr>
<tr>
<tr>
<td class="align-middle">
<i class="bi-exclamation-diamond i-larger"></i>
</td>

View file

@ -5,20 +5,20 @@
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latestmajor</LangVersion>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.Toast" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0-preview.5.23302.2" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0-preview.5.23302.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0-preview.5.23302.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-preview.5.23302.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-preview.5.23302.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-preview.5.23280.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.5.23280.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-preview.5.23280.8" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
<PackageReference Include="Toolbelt.Blazor.HttpClientInterceptor" Version="10.2.0" />
</ItemGroup>

View file

@ -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": {

View file

@ -200,4 +200,5 @@ public class ApiConfig
/// Uri for warehouse requests
/// </summary>
public string Warehouse { get; set; } = "";
}

View file

@ -42,6 +42,10 @@ public class AppInfo
/// Sandbox version
/// </summary>
public bool Sandbox { get; set; }
/// <summary>
/// active SDK
/// </summary>
public string Sdk { get; set; } = "";
}

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

5
alpha-build.sh Normal file
View file

@ -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

View file

@ -1,7 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"version": "7.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
"allowPrerelease": false
}
}