Move src/Imageflow.dncore.sln to ./Imageflow.sln so tools work more e…

…asily by default.

.github/workflows/dotnet-core.yml

@@ -10,9 +10,9 @@ on:
   pull_request:
     branches:
       - main
-    
+
 env:
-  CORE_SLN: ./src/Imageflow.dncore.sln
+  CORE_SLN: ./Imageflow.sln
   FULL_SLN: ./src/Imageflow.dnfull.sln
 jobs:
   build:
@@ -30,31 +30,31 @@ jobs:
             docs: true
             coverage: true
             test_legacy: true
-            
+
     runs-on: ${{matrix.os}}
-    
+
     steps:
     - uses: actions/checkout@v4
-      
+
     - uses: actions/cache@v4
       with:
         path: ~/.nuget/packages
         key: ${{ runner.os    }}-nuget-${{ hashFiles('**/packages.lock.json') }}
         restore-keys: |
           ${{ runner.os }}-nuget-
-        
+
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
           6
           7
           8
-        
+
     - uses: nowsprinting/check-version-format-action@v3.2.10
       id: version
       with:
         prefix: 'v'
-        
+
     - name: For releases only - set TAGGED_VERSION and ARTIFACT_VERSION
       run: |
         echo "TAGGED_VERSION=${{ steps.version.outputs.full_without_prefix }}" >> $GITHUB_ENV
@@ -73,7 +73,7 @@ jobs:
         dotnet clean ${{ env.CORE_SLN }} --configuration Release
         dotnet nuget locals all --clear
       if: github.event_name == 'release'
-    
+
     - name: Test with ${{ matrix.SystemTextJsonVersion }} and ${{ matrix.RecyclableMemoryStreamVersion }}
       if: matrix.SystemTextJsonVersion != null && matrix.RecyclableMemoryStreamVersion != null
       run: |
@@ -89,7 +89,7 @@ jobs:
       if: matrix.coverage == false
       run: |
         dotnet test ${{ env.CORE_SLN }} -c Release
-        
+
     - name: Test with coverage
       if: matrix.coverage
       run: |
@@ -105,7 +105,7 @@ jobs:
       uses: codecov/codecov-action@v3
       if: matrix.coverage
       with:
-        files: 
+        files:
         token: ${{ secrets.CODECOV_TOKEN }} # replace with your Codecov token
         fail_ci_if_error: false
 
@@ -134,7 +134,7 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.3.2
       if: matrix.os == 'windows-latest' && matrix.test_legacy
-      
+
     - name: Build legacy projects on Windows
       if: matrix.test_legacy
       run: |
@@ -151,23 +151,23 @@ jobs:
         dotnet test tests/Imageflow.TestDotNetFullPackageReference/bin/Release/Imageflow.TestDotNetFullPackageReference.dll --platform:x86
         dotnet test tests/Imageflow.TestDotNetFull/bin/Release/Imageflow.TestDotNetFull.dll --platform:x64
         dotnet test tests/Imageflow.TestDotNetFullPackageReference/bin/Release/Imageflow.TestDotNetFullPackageReference.dll --platform:x64
-        
+
     - name: Test use in an AOT web app
       if: matrix.test_aot
       shell: pwsh
       run: ./tests/Imageflow.TestWebAOT/test.ps1
-      
+
   publish:
     needs: build
     if: github.event_name == 'release'
-    
+
     runs-on: ubuntu-latest
     steps:
       - uses: nowsprinting/check-version-format-action@v3
         id: version
         with:
           prefix: 'v'
-      
+
       # Download nuget artifacts from the test job into a folder called NuGetPackages
       - name: Download artifacts
         uses: actions/download-artifact@v4

.gitignore

@@ -12,6 +12,8 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+**/.idea/copilot
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -26,8 +28,10 @@ bld/
 test-publish/
 NuGetPackages/
 
+
+
 # DocFX build results
-_site/ 
+_site/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -292,4 +296,4 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 
-tempfile.txt
+tempfile.txt

Directory.Build.props

@@ -13,25 +13,18 @@
         <Owners>imazen,lilith</Owners>
         <Company>Imazen</Company>
         <CompanyName>Imazen</CompanyName>
-
         <Product>Imageflow Server</Product>
         <RepositoryType>git</RepositoryType>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <PackageLicenseExpression>(AGPL-3.0-or-later OR Apache-2.0+)</PackageLicenseExpression>
-
         <Version Condition="'$(Version)' == ''">$(TAGGED_VERSION)</Version>
         <VersionPrefix>0.1.0</VersionPrefix>
         <VersionSuffix>-notset</VersionSuffix>
         <PackageTags>Image;Resize;Optimize;Crop;Gif;Jpg;Jpeg;Bitmap;Png;Core;WebP;ImageResizer;Imageflow;Rotate;Imaging;Crunch</PackageTags>
-
         <RestoreLockedMode>false</RestoreLockedMode>
-
-
-
-
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -45,7 +38,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(CI)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <!--        This causes pain-->        
+        <!--        This causes pain-->
         <!--        <RestoreLockedMode>true</RestoreLockedMode>-->
     </PropertyGroup>
 
@@ -56,4 +49,4 @@
         <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     </PropertyGroup>
 
-</Project>
+</Project>

Imageflow.sln

@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imageflow.Net", "src\Imageflow\Imageflow.Net.csproj", "{0156A967-E9B3-4E86-B5A2-2390B245DA73}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imageflow.AllPlatforms", "src\Imageflow.AllPlatforms\Imageflow.AllPlatforms.csproj", "{A1F674DC-66D7-481D-8059-FC0E83052E74}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imageflow.Test", "tests\Imageflow.Test\Imageflow.Test.csproj", "{DD7A112C-A488-47EE-AA66-3496173E02BE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imageflow.TestWebAOT", "tests\Imageflow.TestWebAOT\Imageflow.TestWebAOT.csproj", "{A5C78623-E13B-4E09-80D1-9C77A1C3DCA3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0156A967-E9B3-4E86-B5A2-2390B245DA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0156A967-E9B3-4E86-B5A2-2390B245DA73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0156A967-E9B3-4E86-B5A2-2390B245DA73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0156A967-E9B3-4E86-B5A2-2390B245DA73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1F674DC-66D7-481D-8059-FC0E83052E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1F674DC-66D7-481D-8059-FC0E83052E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1F674DC-66D7-481D-8059-FC0E83052E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1F674DC-66D7-481D-8059-FC0E83052E74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD7A112C-A488-47EE-AA66-3496173E02BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD7A112C-A488-47EE-AA66-3496173E02BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD7A112C-A488-47EE-AA66-3496173E02BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD7A112C-A488-47EE-AA66-3496173E02BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5C78623-E13B-4E09-80D1-9C77A1C3DCA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5C78623-E13B-4E09-80D1-9C77A1C3DCA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5C78623-E13B-4E09-80D1-9C77A1C3DCA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5C78623-E13B-4E09-80D1-9C77A1C3DCA3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

Imageflow.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=avif/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=heic/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

global.json

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

src/Imageflow.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=avif/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=heic/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>