Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed arm restore issue. Thanks microsoft for NOT documenting this in the correct issue

Browse Source
This commit is contained in:
Marcel Baumgartner
2024-06-30 00:54:54 +02:00
parent d821ce43b5
commit 48e84e815b
2 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Moonlight/Dockerfile
View File

@@ -1,10 +1,12 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
EXPOSE 443 EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
COPY ["Moonlight/Moonlight.csproj", "Moonlight/"] COPY ["Moonlight/Moonlight.csproj", "Moonlight/"]
RUN dotnet restore "Moonlight/Moonlight.csproj" RUN dotnet restore "Moonlight/Moonlight.csproj"

173
Moonlight/Moonlight.csproj
View File

@@ -5,100 +5,101 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<RuntimeIdentifiers>linux-arm64;linux-x64;win-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\.dockerignore"> <Content Include="..\.dockerignore">
<Link>.dockerignore</Link> <Link>.dockerignore</Link>
</Content> </Content>
<Content Update="Assets\Features\Core\js\moonlight.js"> <Content Update="Assets\Features\Core\js\moonlight.js">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\js\sweetalert2.js"> <Content Update="Assets\Features\Core\js\sweetalert2.js">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\js\toaster.js"> <Content Update="Assets\Features\Core\js\toaster.js">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\js\bootstrap.js"> <Content Update="Assets\Features\Core\js\bootstrap.js">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\css\blazor.css"> <Content Update="Assets\Features\Core\css\blazor.css">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\css\boxicons.css"> <Content Update="Assets\Features\Core\css\boxicons.css">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\css\sweetalert2dark.css"> <Content Update="Assets\Features\Core\css\sweetalert2dark.css">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\Features\Core\css\utils.css"> <Content Update="Assets\Features\Core\css\utils.css">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
<Content Update="Assets\FileManager\js\dropzone.js"> <Content Update="Assets\FileManager\js\dropzone.js">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Core\Database\Migrations\" /> <Folder Include="Core\Database\Migrations\"/>
<Folder Include="Core\Http\Requests\" /> <Folder Include="Core\Http\Requests\"/>
<Folder Include="Core\Http\Resources\" /> <Folder Include="Core\Http\Resources\"/>
<Folder Include="Core\UI\Components\Forms\" /> <Folder Include="Core\UI\Components\Forms\"/>
<Folder Include="Features\Dummy\Configuration\" /> <Folder Include="Features\Dummy\Configuration\"/>
<Folder Include="Features\Dummy\Entities\" /> <Folder Include="Features\Dummy\Entities\"/>
<Folder Include="Features\Dummy\Helpers\" /> <Folder Include="Features\Dummy\Helpers\"/>
<Folder Include="Features\Dummy\Http\Controllers\" /> <Folder Include="Features\Dummy\Http\Controllers\"/>
<Folder Include="Features\Dummy\Http\Middleware\" /> <Folder Include="Features\Dummy\Http\Middleware\"/>
<Folder Include="Features\Dummy\Http\Requests\" /> <Folder Include="Features\Dummy\Http\Requests\"/>
<Folder Include="Features\Dummy\Http\Resources\" /> <Folder Include="Features\Dummy\Http\Resources\"/>
<Folder Include="Features\Dummy\Models\Abstractions\" /> <Folder Include="Features\Dummy\Models\Abstractions\"/>
<Folder Include="Features\Dummy\Models\Enums\" /> <Folder Include="Features\Dummy\Models\Enums\"/>
<Folder Include="Features\Dummy\Models\Forms\" /> <Folder Include="Features\Dummy\Models\Forms\"/>
<Folder Include="Features\Dummy\Services\" /> <Folder Include="Features\Dummy\Services\"/>
<Folder Include="Features\Dummy\UI\Components\" /> <Folder Include="Features\Dummy\UI\Components\"/>
<Folder Include="Features\Dummy\UI\Layouts\" /> <Folder Include="Features\Dummy\UI\Layouts\"/>
<Folder Include="Features\Dummy\UI\Views\" /> <Folder Include="Features\Dummy\UI\Views\"/>
<Folder Include="Features\FileManager\Configuration\" /> <Folder Include="Features\FileManager\Configuration\"/>
<Folder Include="Features\FileManager\Entities\" /> <Folder Include="Features\FileManager\Entities\"/>
<Folder Include="Features\FileManager\Http\Middleware\" /> <Folder Include="Features\FileManager\Http\Middleware\"/>
<Folder Include="Features\FileManager\Http\Requests\" /> <Folder Include="Features\FileManager\Http\Requests\"/>
<Folder Include="Features\FileManager\Http\Resources\" /> <Folder Include="Features\FileManager\Http\Resources\"/>
<Folder Include="Features\Servers\Http\Resources\" /> <Folder Include="Features\Servers\Http\Resources\"/>
<Folder Include="storage\" /> <Folder Include="storage\"/>
<Folder Include="Styles\" /> <Folder Include="Styles\"/>
<Folder Include="wwwroot\css\" /> <Folder Include="wwwroot\css\"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.4.1" /> <PackageReference Include="Ben.Demystifier" Version="0.4.1"/>
<PackageReference Include="Blazor-ApexCharts" Version="2.3.3" /> <PackageReference Include="Blazor-ApexCharts" Version="2.3.3"/>
<PackageReference Include="Blazor.ContextMenu" Version="1.17.0" /> <PackageReference Include="Blazor.ContextMenu" Version="1.17.0"/>
<PackageReference Include="BlazorTable" Version="1.17.0" /> <PackageReference Include="BlazorTable" Version="1.17.0"/>
<PackageReference Include="JWT" Version="10.1.1" /> <PackageReference Include="JWT" Version="10.1.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MimeTypes" Version="2.4.1"> <PackageReference Include="MimeTypes" Version="2.4.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MoonCore" Version="1.3.5" /> <PackageReference Include="MoonCore" Version="1.3.5"/>
<PackageReference Include="MoonCoreUI" Version="1.2.1" /> <PackageReference Include="MoonCoreUI" Version="1.2.1"/>
<PackageReference Include="Otp.NET" Version="1.3.0" /> <PackageReference Include="Otp.NET" Version="1.3.0"/>
<PackageReference Include="QRCoder" Version="1.4.3" /> <PackageReference Include="QRCoder" Version="1.4.3"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2"/>
<PackageReference Include="XtermBlazor" Version="1.10.2" /> <PackageReference Include="XtermBlazor" Version="1.10.2"/>
<PackageReference Include="Z.Blazor.Diagrams" Version="3.0.2" /> <PackageReference Include="Z.Blazor.Diagrams" Version="3.0.2"/>
</ItemGroup> </ItemGroup>
</Project> </Project>