Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the dotnet group in /src/Cropper.Blazor with 7 updates #382

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Bump the dotnet group in /src/Cropper.Blazor with 7 updates #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3189abc
Bump the dotnet group in /src/Cropper.Blazor with 7 updates
dependabot[bot] Sep 2, 2024
e6ec703
Update Cropper.Blazor.UnitTests.csproj
ColdForeign Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
350 changes: 175 additions & 175 deletions src/Cropper.Blazor/Client/Cropper.Blazor.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,175 +1,175 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
</PropertyGroup>

<PropertyGroup>
<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
<PublishTrimmed>true</PublishTrimmed>
<RunAOTCompilation>false</RunAOTCompilation>
<BlazorWasmPrerenderingMode>Static</BlazorWasmPrerenderingMode>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>

<!--Packages-->
<ItemGroup>
<PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
</ItemGroup>

<!--Project dependencies-->
<ItemGroup>
<ProjectReference Include="..\Cropper.Blazor.Shared\Cropper.Blazor.Shared.csproj" />
<ProjectReference Include="..\Cropper.Blazor\Cropper.Blazor.csproj" />
</ItemGroup>

<ItemGroup>
<ServiceWorker Include="wwwroot\service-worker.min.js" PublishedContent="wwwroot\service-worker.published.min.js" />
</ItemGroup>

<!--Outside Visual Studio SolutionDir is not available-->
<PropertyGroup>
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)../</SolutionDir>
</PropertyGroup>

<!--Binary path for the code generator-->
<Choose>
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PropertyGroup>
<BinDocsCompiler>$(SolutionDir)Cropper.Blazor.Client.Compiler/bin/Debug/netcoreapp3.1/Cropper.Blazor.Client.Compiler.dll</BinDocsCompiler>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<BinDocsCompiler>$(SolutionDir)Cropper.Blazor.Client.Compiler/bin/Debug/net8.0/Cropper.Blazor.Client.Compiler.dll</BinDocsCompiler>
</PropertyGroup>
</Otherwise>
</Choose>

<!--Project path for code generator-->
<PropertyGroup>
<ProjectDocsCompiler>dotnet run --configuration release --project "$(SolutionDir)Cropper.Blazor.Client.Compiler/Cropper.Blazor.Client.Compiler.csproj"</ProjectDocsCompiler>
</PropertyGroup>

<!--Execute the code generator-->
<Target Name="CompileDocs" BeforeTargets="BeforeBuild">
<!--Command-line for the code generator-->
<Message Text="Generating Docs" Importance="high" />
<Exec Command="dotnet &quot;$(BinDocsCompiler)&quot;" Condition="Exists('$(BinDocsCompiler)')" />
<Exec Command="$(ProjectDocsCompiler)" Condition="!Exists('$(BinDocsCompiler)')" />
</Target>

<!--This file contains any ExampleCode that is new and needs including in the build -->
<Target Name="ReadFromFile" DependsOnTargets="CompileDocs">
<ItemGroup>
<NewFiles Include="NewFilesToBuild.txt" />
</ItemGroup>
<ReadLinesFromFile File="@(NewFiles)">
<Output TaskParameter="Lines" ItemName="NewExampleCodeToBuild" />
</ReadLinesFromFile>
</Target>

<!--Add Content that is being generated as part of the build cycle-->
<!--We need to do this because the project is not yet aware of files that were generated after the build started-->
<Target Name="IncludeGeneratedFiles" BeforeTargets="BeforeBuild" DependsOnTargets="CompileDocs;ReadFromFile">
<ItemGroup>
<_NewCompiledSnippets Include="Models\Snippets.generated.cs" Exclude="@(Compile)" />
<_NewCompiledDocsStrings Include="Models\DocStrings.generated.cs" Exclude="@(Compile)" />
<Compile Include="@(_NewCompiledSnippets)" />
<Compile Include="@(_NewCompiledDocsStrings)" />
<EmbeddedResource Include="@(NewExampleCodeToBuild)" Condition="@(NewExampleCodeToBuild-&gt;Count()) != 0" />
</ItemGroup>
</Target>

<!--Update ExampleCode-->
<ItemGroup>
<EmbeddedResource Include="Pages\**\*.html" />
</ItemGroup>

<!--Is this a rebuild - Dont clean generated files as this breaks rebuild behaviour-->
<Target Name="ShouldCleanGeneratedFiles" BeforeTargets="BeforeRebuild">
<PropertyGroup>
<CleanGeneratedFiles>false</CleanGeneratedFiles>
</PropertyGroup>
</Target>

<Target Name="CleanGeneratedFiles" BeforeTargets="Clean" Condition="'$(CleanGeneratedFiles)' != 'false'">
<ItemGroup>
<FilesToClean Include="./Styles/Cropper.Blazor.Client.css" />
<FilesToClean Include="./Styles/Cropper.Blazor.Client.min.css" />
<FilesToClean Include="./wwwroot/Cropper.Blazor.Client.css" />
<FilesToClean Include="./wwwroot/Cropper.Blazor.Client.min.css" />
<FilesToClean Include="./wwwroot/service-worker.min.js" />
<FilesToClean Include="./wwwroot/service-worker.published.min.js" />
<FilesToClean Include="./wwwroot/overrideCropperJsInteropModule.min.js" />
<FilesToClean Include="./wwwroot/jsObjectModule.min.js" />
<FilesToClean Include="./Models/DocStrings.generated.cs" />
<FilesToClean Include="./Models/Snippets.generated.cs" />
<FilesToClean Include="./wwwroot/helper.min.js" />
<FilesToClean Include="./wwwroot/sw-registrator.min.js" />
<FilesToClean Include="./wwwroot/sw-registrator.min.js" />
<FilesToClean Include="./Pages/**/*ExampleCode.*" />
<FilesToClean Include="./NewFilesToBuild.txt" />
<FilesToClean Include="./wwwroot/resizeWindowEventListener.min.js" />
<FilesToClean Include="./wwwroot/sitemap.xml" />
</ItemGroup>
<Delete Files="@(FilesToClean)" />
</Target>

<!--Excubo webcompiler - used for scss and js compilation-->
<Target Name="ToolRestore">
<Exec Command="dotnet tool restore" StandardOutputImportance="high" />
</Target>

<Target Name="WebCompiler" DependsOnTargets="ToolRestore">
<Message Text="Running webcompiler" Importance="high" />
<!--Compile and minify scss-->
<Exec Command="dotnet webcompiler ./Styles/Cropper.Blazor.Client.scss -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<!--Compile and minify js-->
<Exec Command="dotnet webcompiler ./wwwroot/service-worker.published.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/service-worker.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/overrideCropperJsInteropModule.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/jsObjectModule.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/helper.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/sw-registrator.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/resizeWindowEventListener.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
</Target>

<!--Output of Excubo webcompiler-->
<Target Name="IncludeGeneratedStaticFiles" DependsOnTargets="WebCompiler" BeforeTargets="BeforeBuild">
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/Cropper.Blazor.Client.min.css')" Text="Missing Cropper.Blazor.Client.min.css in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/service-worker.min.js')" Text="Missing service-worker.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/service-worker.published.min.js')" Text="Missing service-worker.published.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/overrideCropperJsInteropModule.min.js')" Text="Missing overrideCropperJsInteropModule.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/jsObjectModule.min.js')" Text="Missing jsObjectModule.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/helper.min.js')" Text="Missing helper.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/sw-registrator.min.js')" Text="Missing sw-registrator.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/resizeWindowEventListener.min.js')" Text="Missing resizeWindowEventListener.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/NewFilesToBuild.txt')" Text="Missing NewFilesToBuild.txt" />
<ItemGroup>
<Content Include="wwwroot/Cropper.Blazor.Client.min.css" Condition="!Exists('wwwroot/Cropper.Blazor.Client.min.css')" />
<Content Include="wwwroot/service-worker.min.js" Condition="!Exists('wwwroot/service-worker.min.js')" />
<Content Include="wwwroot/service-worker.published.min.js" Condition="!Exists('wwwroot/service-worker.published.min.js')" />
<Content Include="wwwroot/overrideCropperJsInteropModule.min.js" Condition="!Exists('wwwroot/overrideCropperJsInteropModule.min.js')" />
<Content Include="wwwroot/jsObjectModule.min.js" Condition="!Exists('wwwroot/jsObjectModule.min.js')" />
<Content Include="wwwroot/helper.min.js" Condition="!Exists('wwwroot/helper.min.js')" />
<Content Include="wwwroot/sw-registrator.min.js" Condition="!Exists('wwwroot/sw-registrator.min.js')" />
<Content Include="wwwroot/resizeWindowEventListener.min.js" Condition="!Exists('wwwroot/resizeWindowEventListener.min.js')" />
</ItemGroup>
</Target>

<!--Dont Include in build output-->
<ItemGroup>
<Content Remove="compilerconfig.json" />
<Content Remove="excubowebcompiler.json" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
</PropertyGroup>
<PropertyGroup>
<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
<PublishTrimmed>true</PublishTrimmed>
<RunAOTCompilation>false</RunAOTCompilation>
<BlazorWasmPrerenderingMode>Static</BlazorWasmPrerenderingMode>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<!--Packages-->
<ItemGroup>
<PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
</ItemGroup>
<!--Project dependencies-->
<ItemGroup>
<ProjectReference Include="..\Cropper.Blazor.Shared\Cropper.Blazor.Shared.csproj" />
<ProjectReference Include="..\Cropper.Blazor\Cropper.Blazor.csproj" />
</ItemGroup>
<ItemGroup>
<ServiceWorker Include="wwwroot\service-worker.min.js" PublishedContent="wwwroot\service-worker.published.min.js" />
</ItemGroup>
<!--Outside Visual Studio SolutionDir is not available-->
<PropertyGroup>
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)../</SolutionDir>
</PropertyGroup>
<!--Binary path for the code generator-->
<Choose>
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PropertyGroup>
<BinDocsCompiler>$(SolutionDir)Cropper.Blazor.Client.Compiler/bin/Debug/netcoreapp3.1/Cropper.Blazor.Client.Compiler.dll</BinDocsCompiler>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<BinDocsCompiler>$(SolutionDir)Cropper.Blazor.Client.Compiler/bin/Debug/net8.0/Cropper.Blazor.Client.Compiler.dll</BinDocsCompiler>
</PropertyGroup>
</Otherwise>
</Choose>
<!--Project path for code generator-->
<PropertyGroup>
<ProjectDocsCompiler>dotnet run --configuration release --project "$(SolutionDir)Cropper.Blazor.Client.Compiler/Cropper.Blazor.Client.Compiler.csproj"</ProjectDocsCompiler>
</PropertyGroup>
<!--Execute the code generator-->
<Target Name="CompileDocs" BeforeTargets="BeforeBuild">
<!--Command-line for the code generator-->
<Message Text="Generating Docs" Importance="high" />
<Exec Command="dotnet &quot;$(BinDocsCompiler)&quot;" Condition="Exists('$(BinDocsCompiler)')" />
<Exec Command="$(ProjectDocsCompiler)" Condition="!Exists('$(BinDocsCompiler)')" />
</Target>
<!--This file contains any ExampleCode that is new and needs including in the build -->
<Target Name="ReadFromFile" DependsOnTargets="CompileDocs">
<ItemGroup>
<NewFiles Include="NewFilesToBuild.txt" />
</ItemGroup>
<ReadLinesFromFile File="@(NewFiles)">
<Output TaskParameter="Lines" ItemName="NewExampleCodeToBuild" />
</ReadLinesFromFile>
</Target>
<!--Add Content that is being generated as part of the build cycle-->
<!--We need to do this because the project is not yet aware of files that were generated after the build started-->
<Target Name="IncludeGeneratedFiles" BeforeTargets="BeforeBuild" DependsOnTargets="CompileDocs;ReadFromFile">
<ItemGroup>
<_NewCompiledSnippets Include="Models\Snippets.generated.cs" Exclude="@(Compile)" />
<_NewCompiledDocsStrings Include="Models\DocStrings.generated.cs" Exclude="@(Compile)" />
<Compile Include="@(_NewCompiledSnippets)" />
<Compile Include="@(_NewCompiledDocsStrings)" />
<EmbeddedResource Include="@(NewExampleCodeToBuild)" Condition="@(NewExampleCodeToBuild-&gt;Count()) != 0" />
</ItemGroup>
</Target>
<!--Update ExampleCode-->
<ItemGroup>
<EmbeddedResource Include="Pages\**\*.html" />
</ItemGroup>
<!--Is this a rebuild - Dont clean generated files as this breaks rebuild behaviour-->
<Target Name="ShouldCleanGeneratedFiles" BeforeTargets="BeforeRebuild">
<PropertyGroup>
<CleanGeneratedFiles>false</CleanGeneratedFiles>
</PropertyGroup>
</Target>
<Target Name="CleanGeneratedFiles" BeforeTargets="Clean" Condition="'$(CleanGeneratedFiles)' != 'false'">
<ItemGroup>
<FilesToClean Include="./Styles/Cropper.Blazor.Client.css" />
<FilesToClean Include="./Styles/Cropper.Blazor.Client.min.css" />
<FilesToClean Include="./wwwroot/Cropper.Blazor.Client.css" />
<FilesToClean Include="./wwwroot/Cropper.Blazor.Client.min.css" />
<FilesToClean Include="./wwwroot/service-worker.min.js" />
<FilesToClean Include="./wwwroot/service-worker.published.min.js" />
<FilesToClean Include="./wwwroot/overrideCropperJsInteropModule.min.js" />
<FilesToClean Include="./wwwroot/jsObjectModule.min.js" />
<FilesToClean Include="./Models/DocStrings.generated.cs" />
<FilesToClean Include="./Models/Snippets.generated.cs" />
<FilesToClean Include="./wwwroot/helper.min.js" />
<FilesToClean Include="./wwwroot/sw-registrator.min.js" />
<FilesToClean Include="./wwwroot/sw-registrator.min.js" />
<FilesToClean Include="./Pages/**/*ExampleCode.*" />
<FilesToClean Include="./NewFilesToBuild.txt" />
<FilesToClean Include="./wwwroot/resizeWindowEventListener.min.js" />
<FilesToClean Include="./wwwroot/sitemap.xml" />
</ItemGroup>
<Delete Files="@(FilesToClean)" />
</Target>
<!--Excubo webcompiler - used for scss and js compilation-->
<Target Name="ToolRestore">
<Exec Command="dotnet tool restore" StandardOutputImportance="high" />
</Target>
<Target Name="WebCompiler" DependsOnTargets="ToolRestore">
<Message Text="Running webcompiler" Importance="high" />
<!--Compile and minify scss-->
<Exec Command="dotnet webcompiler ./Styles/Cropper.Blazor.Client.scss -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<!--Compile and minify js-->
<Exec Command="dotnet webcompiler ./wwwroot/service-worker.published.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/service-worker.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/overrideCropperJsInteropModule.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/jsObjectModule.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/helper.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/sw-registrator.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
<Exec Command="dotnet webcompiler ./wwwroot/resizeWindowEventListener.js -c excubowebcompiler.json" StandardOutputImportance="high" StandardErrorImportance="high" />
</Target>
<!--Output of Excubo webcompiler-->
<Target Name="IncludeGeneratedStaticFiles" DependsOnTargets="WebCompiler" BeforeTargets="BeforeBuild">
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/Cropper.Blazor.Client.min.css')" Text="Missing Cropper.Blazor.Client.min.css in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/service-worker.min.js')" Text="Missing service-worker.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/service-worker.published.min.js')" Text="Missing service-worker.published.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/overrideCropperJsInteropModule.min.js')" Text="Missing overrideCropperJsInteropModule.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/jsObjectModule.min.js')" Text="Missing jsObjectModule.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/helper.min.js')" Text="Missing helper.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/sw-registrator.min.js')" Text="Missing sw-registrator.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/wwwroot/resizeWindowEventListener.min.js')" Text="Missing resizeWindowEventListener.min.js in wwwroot" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)/NewFilesToBuild.txt')" Text="Missing NewFilesToBuild.txt" />
<ItemGroup>
<Content Include="wwwroot/Cropper.Blazor.Client.min.css" Condition="!Exists('wwwroot/Cropper.Blazor.Client.min.css')" />
<Content Include="wwwroot/service-worker.min.js" Condition="!Exists('wwwroot/service-worker.min.js')" />
<Content Include="wwwroot/service-worker.published.min.js" Condition="!Exists('wwwroot/service-worker.published.min.js')" />
<Content Include="wwwroot/overrideCropperJsInteropModule.min.js" Condition="!Exists('wwwroot/overrideCropperJsInteropModule.min.js')" />
<Content Include="wwwroot/jsObjectModule.min.js" Condition="!Exists('wwwroot/jsObjectModule.min.js')" />
<Content Include="wwwroot/helper.min.js" Condition="!Exists('wwwroot/helper.min.js')" />
<Content Include="wwwroot/sw-registrator.min.js" Condition="!Exists('wwwroot/sw-registrator.min.js')" />
<Content Include="wwwroot/resizeWindowEventListener.min.js" Condition="!Exists('wwwroot/resizeWindowEventListener.min.js')" />
</ItemGroup>
</Target>
<!--Dont Include in build output-->
<ItemGroup>
<Content Remove="compilerconfig.json" />
<Content Remove="excubowebcompiler.json" />
</ItemGroup>
</Project>
Loading
Loading