diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 24dbb15d..b001b2ab 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -12,7 +12,7 @@ body: attributes: label: PDFtoImage version description: Which version of PDFtoImage is affected? - value: 4.1.1 + value: 5.0.0 validations: required: true - type: dropdown diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5194cb51..4cc5bf8b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -70,8 +70,9 @@ jobs: with: dotnet-version: | 6.x - 7.x 8.x + 9.x + dotnet-quality: 'ga' - name: Setup .NET workload maui-android run: dotnet workload install maui-android - name: Setup .NET workload maui-ios @@ -117,51 +118,26 @@ jobs: if-no-files-found: error retention-days: 1 compression-level: 9 - - name: Publish test project MonoConsole - uses: actions/upload-artifact@main - if: success() && (github.event_name != 'workflow_dispatch' && true || inputs.run_tests) == true - with: - name: MonoConsole - path: src/FrameworkTests/MonoConsole/bin/${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} - if-no-files-found: error - retention-days: 1 test: name: Test (${{ matrix.os }}) needs: build strategy: fail-fast: false matrix: - os: [windows-2019, windows-2022, ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14] + os: [windows-2019, windows-2022, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-13, macos-14, macos-15] runs-on: ${{ matrix.os }} if: success() && (github.event_name != 'workflow_dispatch' && true || inputs.run_tests) == true steps: - - name: Setup Mono - if: runner.os == 'Windows' - run: choco install mono -y && Add-Content $env:GITHUB_PATH "C:\Program Files\Mono\bin" - name: Setup .NET uses: actions/setup-dotnet@main with: dotnet-version: | 6.x - 7.x 8.x - - name: Download test project MonoConsole - if: success() || failure() - uses: actions/download-artifact@main - with: - name: MonoConsole - path: MonoConsole - - name: Mono (.NET Framework 4.6.2) - if: success() || failure() - run: mono MonoConsole/net462/PDFtoImage.FrameworkTests.MonoConsole.exe - - name: Mono (.NET Framework 4.7.1) - if: success() || failure() - run: mono MonoConsole/net471/PDFtoImage.FrameworkTests.MonoConsole.exe - - name: Mono (.NET Framework 4.8.1) - if: success() || failure() - run: mono MonoConsole/net481/PDFtoImage.FrameworkTests.MonoConsole.exe + 9.x + dotnet-quality: 'ga' - name: Download test assemblies - if: success() || failure() + if: (success() || failure()) uses: actions/download-artifact@main with: name: Test assemblies @@ -177,12 +153,12 @@ jobs: - name: .NET 6 if: success() || failure() run: dotnet test net6.0/*.Tests.dll --logger trx --verbosity detailed --results-directory "${{ matrix.os }}/TestResults" ${{ (github.event_name == 'workflow_dispatch' && inputs.generate_assets) == true && '--settings net6.0/SaveOutputInGeneratedFolder.runsettings' || '' }} - - name: .NET 7 - if: success() || failure() - run: dotnet test net7.0/*.Tests.dll --logger trx --verbosity detailed --results-directory "${{ matrix.os }}/TestResults" ${{ (github.event_name == 'workflow_dispatch' && inputs.generate_assets) == true && '--settings net8.0/SaveOutputInGeneratedFolder.runsettings' || '' }} - name: .NET 8 if: success() || failure() run: dotnet test net8.0/*.Tests.dll --logger trx --verbosity detailed --results-directory "${{ matrix.os }}/TestResults" ${{ (github.event_name == 'workflow_dispatch' && inputs.generate_assets) == true && '--settings net8.0/SaveOutputInGeneratedFolder.runsettings' || '' }} + - name: .NET 9 + if: success() || failure() + run: dotnet test net9.0/*.Tests.dll --logger trx --verbosity detailed --results-directory "${{ matrix.os }}/TestResults" ${{ (github.event_name == 'workflow_dispatch' && inputs.generate_assets) == true && '--settings net9.0/SaveOutputInGeneratedFolder.runsettings' || '' }} - name: Upload test results if: success() || failure() uses: actions/upload-artifact@main @@ -216,30 +192,27 @@ jobs: src/PDFtoImage src/FrameworkTests/AotConsole src/Tests/Assets/SocialPreview.pdf + - name: console (alpine) + if: runner.os == 'Linux' && (success() || failure()) + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile . && docker run --rm -t console + - name: console (alpine-aot) + if: runner.os == 'Linux' && (success() || failure()) + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile . && docker run --rm -t console - name: console (ubuntu) if: runner.os == 'Linux' && (success() || failure()) - run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile . && docker run --rm -t console + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile . && docker run --rm -t console - name: console (ubuntu-chiseled) if: runner.os == 'Linux' && (success() || failure()) - run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile . && docker run --rm -t console + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile . && docker run --rm -t console - name: console (ubuntu-aot) if: runner.os == 'Linux' && (success() || failure()) - run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile . && docker run --rm -t console + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile . && docker run --rm -t console - name: console (ubuntu-chiseled-aot) if: runner.os == 'Linux' && (success() || failure()) - run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile . && docker run --rm -t console + run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile . && docker run --rm -t console - name: console (windows-servercore) if: runner.os == 'Windows' && (success() || failure()) - run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore.dockerfile" . && docker build -t console -f windows-servercore.dockerfile . && docker run --rm -t console - - name: console (windows-servercore-aot) - if: false && runner.os == 'Windows' && (success() || failure()) - run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore-aot.dockerfile" . && docker build -t console -f windows-servercore-aot.dockerfile . && docker run --rm -t console - - name: console (windows-nanoserver) - if: false && runner.os == 'Windows' && (success() || failure()) - run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-nanoserver.dockerfile" . && docker build -t console -f windows-nanoserver.dockerfile . && docker run --rm -t console - - name: console (windows-nanoserver-aot) - if: false && runner.os == 'Windows' && (success() || failure()) - run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-nanoserver-aot.dockerfile" . && docker build -t console -f windows-nanoserver-aot.dockerfile . && docker run --rm -t console + run: docker build -t console -f src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore.dockerfile . && docker run --rm -t console publish-test-results: name: Publish tests results needs: [test, docker] @@ -290,10 +263,13 @@ jobs: with: dotnet-version: | 6.x - 7.x 8.x + 9.x + dotnet-quality: 'ga' - name: Setup .NET workload maui-android run: dotnet workload install maui-android + - name: Setup .NET workload maui-ios + run: dotnet workload install maui-ios - name: Setup dotnet-coverage run: dotnet tool install --global dotnet-coverage - name: Setup JDK 17 diff --git a/.github/workflows/githubpages.yml b/.github/workflows/githubpages.yml index d628b7e6..07dc6a16 100644 --- a/.github/workflows/githubpages.yml +++ b/.github/workflows/githubpages.yml @@ -20,7 +20,8 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@main with: - dotnet-version: 8.x + dotnet-version: 9.x + dotnet-quality: 'ga' - name: Setup .NET workload maui-android run: dotnet workload install maui-android - name: Setup .NET workload maui-ios @@ -40,9 +41,9 @@ jobs: - name: Publish run: dotnet publish src/WebConverter/WebConverter.csproj -c Release -p:PublishProfile=src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml -p:VersionSuffix=ci --no-restore - name: Create .nojekyll file - run: touch src/WebConverter/bin/Release/net8.0/publish/wwwroot/.nojekyll + run: touch src/WebConverter/bin/Release/net9.0/publish/wwwroot/.nojekyll - name: Update service-worker-assets.js hashes - working-directory: src/WebConverter/bin/Release/net8.0/publish/wwwroot + working-directory: src/WebConverter/bin/Release/net9.0/publish/wwwroot if: false run: | jsFile=$( - net462;net471;net481;net6.0;net7.0;net8.0 + net462;net471;net481;net6.0;net8.0;net9.0 win-x86;win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 Exe PDFtoImage.Console PDFtoImage.Console PDFtoImage.Console.Program - 4.1.1 + 5.0.0 Debug;Release;ReleaseSigned diff --git a/src/FrameworkTests/AotConsole/AotConsole.csproj b/src/FrameworkTests/AotConsole/AotConsole.csproj index bcc8c6e8..b04ec6d2 100644 --- a/src/FrameworkTests/AotConsole/AotConsole.csproj +++ b/src/FrameworkTests/AotConsole/AotConsole.csproj @@ -1,8 +1,8 @@  Exe - net8.0 - win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 + net9.0 + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64 enable enable PDFtoImage.FrameworkTests.AotConsole diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile new file mode 100644 index 00000000..e0122def --- /dev/null +++ b/src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile @@ -0,0 +1,26 @@ +FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine AS base +WORKDIR /app + +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS restore +ARG BUILD_CONFIGURATION=Release +RUN apk update \ + && apk add build-base zlib-dev +WORKDIR /src +COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] +COPY ["src/PDFtoImage", "src/PDFtoImage"] +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 +COPY . . +WORKDIR "/src/src" + +FROM restore AS build +ARG BUILD_CONFIGURATION=Release +RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c $BUILD_CONFIGURATION -o /app/build --no-restore + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./FrameworkTests/AotConsole/AotConsole.csproj" -c $BUILD_CONFIGURATION -o /app/publish --no-restore + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["./PDFtoImage.FrameworkTests.AotConsole"] \ No newline at end of file diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile similarity index 70% rename from src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver.dockerfile rename to src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile index f47edce8..b81f5c8c 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile @@ -1,18 +1,18 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0-nanoserver-ltsc2022 AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" FROM restore AS build ARG BUILD_CONFIGURATION=Release -RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c %BUILD_CONFIGURATION% -o /app/build --no-restore +RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c $BUILD_CONFIGURATION -o /app/build --no-restore FROM base AS final WORKDIR /app diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile index 9046293f..14cb3449 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0 AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile index b586fbed..c1db2196 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-noble-chiseled AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble-chiseled AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile index 80cd1e32..57acb20e 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0-noble-chiseled AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile index 9ee297f7..30da6bc7 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile deleted file mode 100644 index 34afe383..00000000 --- a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 AS base -WORKDIR /app - -FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS restore -ARG BUILD_CONFIGURATION=Release -WORKDIR /src -COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] -COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 -COPY . . -WORKDIR "/src/src" - -FROM restore AS build -ARG BUILD_CONFIGURATION=Release -RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c %BUILD_CONFIGURATION% -o /app/build --no-restore - -FROM build AS vsbuildtools -SHELL ["cmd", "/S", "/C"] - -RUN powershell -c "Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe" -RUN (start /w vs_buildtools.exe --wait --norestart --nocache \ - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" \ - --add Microsoft.VisualStudio.Workload.VCTools \ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ - --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 \ - --remove Microsoft.VisualStudio.Component.Windows81SDK \ - || IF "%ERRORLEVEL%"=="3010" EXIT 0) \ - && del /q vs_buildtools.exe - -FROM vsbuildtools AS publish -ARG BUILD_CONFIGURATION=Release -RUN dotnet publish "./FrameworkTests/AotConsole/AotConsole.csproj" -c %BUILD_CONFIGURATION% -o /app/publish --no-restore - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["PDFtoImage.FrameworkTests.AotConsole.exe"] \ No newline at end of file diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile index 31d071cb..85bd2b44 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2022 +FROM mcr.microsoft.com/windows/servercore:ltsc2022 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" @@ -15,20 +15,27 @@ ARG BUILD_CONFIGURATION=Release RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c %BUILD_CONFIGURATION% -o /app/build --no-restore FROM build AS vsbuildtools -SHELL ["cmd", "/S", "/C"] +SHELL ["powershell", "-NoLogo", "-NonInteractive", "-Command"] -RUN powershell -c "Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe" -RUN (start /w vs_buildtools.exe --wait --norestart --nocache \ - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" \ - --add Microsoft.VisualStudio.Workload.VCTools \ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ - --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 \ - --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 \ - --remove Microsoft.VisualStudio.Component.Windows81SDK \ - || IF "%ERRORLEVEL%"=="3010" EXIT 0) \ - && del /q vs_buildtools.exe +RUN Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe +RUN .\vs_buildtools.exe --quiet --wait --norestart --nocache \ + --installPath \"%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\" \ + --add Microsoft.VisualStudio.Component.Roslyn.Compiler \ + --add Microsoft.Component.MSBuild \ + --add Microsoft.VisualStudio.Component.CoreBuildTools \ + --add Microsoft.VisualStudio.Workload.MSBuildTools \ + --add Microsoft.VisualStudio.Component.Windows10SDK \ + --add Microsoft.VisualStudio.Component.VC.CoreBuildTools \ + --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ + --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest \ + --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \ + --add Microsoft.VisualStudio.Component.TextTemplating \ + --add Microsoft.VisualStudio.Component.VC.CoreIde \ + --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \ + --add Microsoft.VisualStudio.Workload.VCTools \ + --add Microsoft.Component.MSBuild \ + --add Microsoft.VisualStudio.Workload.VCTools +RUN Remove-Item vs_buildtools.exe FROM vsbuildtools AS publish ARG BUILD_CONFIGURATION=Release diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore.dockerfile index dc788222..cd08daad 100644 --- a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore.dockerfile +++ b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore.dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0-windowsservercore-ltsc2022 AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0-windowsservercore-ltsc2022 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS restore +FROM mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022 AS restore ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["src/FrameworkTests/AotConsole/AotConsole.csproj", "src/FrameworkTests/AotConsole/AotConsole.csproj"] COPY ["src/PDFtoImage", "src/PDFtoImage"] -RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net8.0 +RUN dotnet restore "./src/FrameworkTests/AotConsole/AotConsole.csproj" /p:TargetFramework=net9.0 COPY . . WORKDIR "/src/src" diff --git a/src/FrameworkTests/AspNet/index.cshtml b/src/FrameworkTests/AspNet/index.cshtml index 97e48bef..c3a8354f 100644 --- a/src/FrameworkTests/AspNet/index.cshtml +++ b/src/FrameworkTests/AspNet/index.cshtml @@ -10,7 +10,7 @@ } } - + diff --git a/src/FrameworkTests/AspNetCore/AspNetCore.csproj b/src/FrameworkTests/AspNetCore/AspNetCore.csproj index c620eee0..b31288c1 100644 --- a/src/FrameworkTests/AspNetCore/AspNetCore.csproj +++ b/src/FrameworkTests/AspNetCore/AspNetCore.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable PDFtoImage.FrameworkTests.AspNetCore diff --git a/src/FrameworkTests/MauiApp/MauiApp.csproj b/src/FrameworkTests/MauiApp/MauiApp.csproj index 3a9120d3..045dcd07 100644 --- a/src/FrameworkTests/MauiApp/MauiApp.csproj +++ b/src/FrameworkTests/MauiApp/MauiApp.csproj @@ -1,10 +1,10 @@  - net8.0-android;net8.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net9.0-android;net9.0-ios + $(TargetFrameworks);net9.0-windows10.0.19041.0 - + Exe PDFtoImage.FrameworkTests.MauiApp true @@ -28,15 +28,9 @@ 10.0.17763.0 10.0.17763.0 6.5 + true - - false - - - - ios-arm64 - @@ -56,9 +50,9 @@ - - - + + + diff --git a/src/FrameworkTests/MonoAndroid/Assets/AboutAssets.txt b/src/FrameworkTests/MonoAndroid/Assets/AboutAssets.txt deleted file mode 100644 index dcb04096..00000000 --- a/src/FrameworkTests/MonoAndroid/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with your package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/MainActivity.cs b/src/FrameworkTests/MonoAndroid/MainActivity.cs deleted file mode 100644 index adfb0a3a..00000000 --- a/src/FrameworkTests/MonoAndroid/MainActivity.cs +++ /dev/null @@ -1,77 +0,0 @@ -using Android.App; -using Android.OS; -using Android.Runtime; -using Android.Views; -using AndroidX.AppCompat.App; -using AndroidX.AppCompat.Widget; -using Google.Android.Material.FloatingActionButton; -using Google.Android.Material.Snackbar; -using System; -using System.IO; - -namespace PDFtoImage.FrameworkTests.MonoAndroid -{ - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)] - public class MainActivity : AppCompatActivity - { - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - Xamarin.Essentials.Platform.Init(this, savedInstanceState); - SetContentView(Resource.Layout.activity_main); - - Toolbar toolbar = FindViewById(Resource.Id.toolbar); - SetSupportActionBar(toolbar); - - FloatingActionButton fab = FindViewById(Resource.Id.fab); - fab.Click += FabOnClick; - } - - public override bool OnCreateOptionsMenu(IMenu menu) - { - MenuInflater.Inflate(Resource.Menu.menu_main, menu); - return true; - } - - public override bool OnOptionsItemSelected(IMenuItem item) - { - int id = item.ItemId; - if (id == Resource.Id.action_settings) - { - return true; - } - - return base.OnOptionsItemSelected(item); - } - - private void FabOnClick(object sender, EventArgs eventArgs) - { - string snackbarMessage; - - try - { - using var input = Assets.Open("SocialPreview.pdf"); - using var ms = new MemoryStream(); - input.CopyTo(ms); - - using var bitmap = PDFtoImage.Conversion.ToImage(ms); - - snackbarMessage = $"SocialPreview.pdf size: {bitmap.Width}x{bitmap.Height}"; - } - catch (Exception ex) - { - snackbarMessage = ex.ToString(); - } - - Snackbar.Make((View)sender, snackbarMessage, Snackbar.LengthIndefinite) - .SetAction("Action", (View.IOnClickListener)null).Show(); - } - - public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults) - { - Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); - - base.OnRequestPermissionsResult(requestCode, permissions, grantResults); - } - } -} diff --git a/src/FrameworkTests/MonoAndroid/MonoAndroid.csproj b/src/FrameworkTests/MonoAndroid/MonoAndroid.csproj deleted file mode 100644 index d8e804ba..00000000 --- a/src/FrameworkTests/MonoAndroid/MonoAndroid.csproj +++ /dev/null @@ -1,133 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {E6458852-9C48-48CE-AC1C-99374F3B3092} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {84dd83c5-0fe3-4294-9419-09e7c8ba324f} - Library - Properties - PDFtoImage.FrameworkTests.MonoAndroid - PDFtoImage.FrameworkTests.MonoAndroid - 512 - True - True - Resources\Resource.designer.cs - Resource - Off - false - v13.0 - Properties\AndroidManifest.xml - Resources - Assets - true - true - Xamarin.Android.Net.AndroidClientHandler - - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - None - False - false - false - false - false - - - - True - portable - True - bin\Release\ - TRACE - prompt - 4 - aab - true - SdkOnly - True - - - - - - - - - - - - - - - - - Assets\SocialPreview.pdf - - - - - - - - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8b914618-4261-4f13-bf7f-39be2b1b1cf6} - PDFtoImage - - - - - \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Properties/AndroidManifest.xml b/src/FrameworkTests/MonoAndroid/Properties/AndroidManifest.xml deleted file mode 100644 index e9e2ae75..00000000 --- a/src/FrameworkTests/MonoAndroid/Properties/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Properties/AssemblyInfo.cs b/src/FrameworkTests/MonoAndroid/Properties/AssemblyInfo.cs deleted file mode 100644 index a9b543a5..00000000 --- a/src/FrameworkTests/MonoAndroid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MonoAndroid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MonoAndroid")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/FrameworkTests/MonoAndroid/Resources/AboutResources.txt b/src/FrameworkTests/MonoAndroid/Resources/AboutResources.txt deleted file mode 100644 index 096447a9..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.xml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.xml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.xml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Resources/Resource.designer.cs b/src/FrameworkTests/MonoAndroid/Resources/Resource.designer.cs deleted file mode 100644 index f17d0d8d..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/Resource.designer.cs +++ /dev/null @@ -1,208 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("PDFtoImage.FrameworkTests.MonoAndroid.Resource", IsApplication=true)] - -namespace PDFtoImage.FrameworkTests.MonoAndroid -{ - - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Color - { - - // aapt resource value: 0x7F010000 - public const int colorAccent = 2130771968; - - // aapt resource value: 0x7F010001 - public const int colorPrimary = 2130771969; - - // aapt resource value: 0x7F010002 - public const int colorPrimaryDark = 2130771970; - - // aapt resource value: 0x7F010003 - public const int ic_launcher_background = 2130771971; - - static Color() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Color() - { - } - } - - public partial class Dimension - { - - // aapt resource value: 0x7F020000 - public const int fab_margin = 2130837504; - - static Dimension() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Dimension() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7F030000 - public const int action_settings = 2130903040; - - // aapt resource value: 0x7F030001 - public const int fab = 2130903041; - - // aapt resource value: 0x7F030002 - public const int toolbar = 2130903042; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7F040000 - public const int activity_main = 2130968576; - - // aapt resource value: 0x7F040001 - public const int content_main = 2130968577; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Menu - { - - // aapt resource value: 0x7F050000 - public const int menu_main = 2131034112; - - static Menu() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Menu() - { - } - } - - public partial class Mipmap - { - - // aapt resource value: 0x7F060000 - public const int ic_launcher = 2131099648; - - // aapt resource value: 0x7F060001 - public const int ic_launcher_foreground = 2131099649; - - // aapt resource value: 0x7F060002 - public const int ic_launcher_round = 2131099650; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7F070000 - public const int action_settings = 2131165184; - - // aapt resource value: 0x7F070001 - public const int app_name = 2131165185; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - - public partial class Style - { - - // aapt resource value: 0x7F080000 - public const int AppTheme = 2131230720; - - // aapt resource value: 0x7F080001 - public const int AppTheme_AppBarOverlay = 2131230721; - - // aapt resource value: 0x7F080002 - public const int AppTheme_NoActionBar = 2131230722; - - // aapt resource value: 0x7F080003 - public const int AppTheme_PopupOverlay = 2131230723; - - static Style() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Style() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/src/FrameworkTests/MonoAndroid/Resources/layout/activity_main.xml b/src/FrameworkTests/MonoAndroid/Resources/layout/activity_main.xml deleted file mode 100644 index 6a29dbda..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/layout/activity_main.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/FrameworkTests/MonoAndroid/Resources/layout/content_main.xml b/src/FrameworkTests/MonoAndroid/Resources/layout/content_main.xml deleted file mode 100644 index 9cbe31bb..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/layout/content_main.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/src/FrameworkTests/MonoAndroid/Resources/menu/menu_main.xml b/src/FrameworkTests/MonoAndroid/Resources/menu/menu_main.xml deleted file mode 100644 index ace8c659..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/menu/menu_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher.xml b/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_foreground.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c25..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_round.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c0..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_foreground.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_round.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909c..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_round.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_round.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5c..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714e..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd52..00000000 Binary files a/src/FrameworkTests/MonoAndroid/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/src/FrameworkTests/MonoAndroid/Resources/values/colors.xml b/src/FrameworkTests/MonoAndroid/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9d..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/src/FrameworkTests/MonoAndroid/Resources/values/dimens.xml b/src/FrameworkTests/MonoAndroid/Resources/values/dimens.xml deleted file mode 100644 index 59a0b0c4..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/values/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 16dp - diff --git a/src/FrameworkTests/MonoAndroid/Resources/values/ic_launcher_background.xml b/src/FrameworkTests/MonoAndroid/Resources/values/ic_launcher_background.xml deleted file mode 100644 index 6ec24e64..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2C3E50 - \ No newline at end of file diff --git a/src/FrameworkTests/MonoAndroid/Resources/values/strings.xml b/src/FrameworkTests/MonoAndroid/Resources/values/strings.xml deleted file mode 100644 index c02e5315..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - MonoAndroid - Settings - diff --git a/src/FrameworkTests/MonoAndroid/Resources/values/styles.xml b/src/FrameworkTests/MonoAndroid/Resources/values/styles.xml deleted file mode 100644 index fef37f9b..00000000 --- a/src/FrameworkTests/MonoAndroid/Resources/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -