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

[develop] Prepare for December release #121

Merged
merged 16 commits into from
Nov 28, 2024
Merged

[develop] Prepare for December release #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a601177
Release 2023.12 into Master (#82)
michael-ironsoftware Nov 2, 2023
74602cd
Merge branch 'master' into releases/2024.3.1
mee-ironsoftware Mar 13, 2024
987eb33
Merge pull request #97 from iron-software/releases/2024.3.1
mee-ironsoftware Mar 13, 2024
6ff8792
Merge pull request #99 from iron-software/releases/2024.4
mee-ironsoftware Apr 4, 2024
3e204ca
Merge pull request #103 from iron-software/releases/2024.5
mee-ironsoftware Apr 23, 2024
984c891
Merge pull request #106 from iron-software/releases/2024.6
first-ironsoftware May 20, 2024
e534614
Merge pull request #110 from iron-software/releases/2024.7
first-ironsoftware Jun 20, 2024
f09ffa0
chore: Update SixLabors.ImageSharp package versions to fix vulnerable
mee-ironsoftware Jul 23, 2024
1f817d5
chore: Update SixLabors.ImageSharp.Drawing package version to 2.1.4
mee-ironsoftware Jul 23, 2024
22ceb6a
NuGet: Update release notes
mee-ironsoftware Jul 23, 2024
ab0e303
Merge pull request #113 from iron-software/hotfix/2024.8.1
djrecipe Aug 15, 2024
8d10993
Dependencies: Change to use IronSoftware.Drawing.Abstractions instead…
mee-ironsoftware Nov 14, 2024
30b048c
Release 2023.12 into Master (#82)
michael-ironsoftware Nov 2, 2023
5ee302a
chore: Update SixLabors.ImageSharp package versions to fix vulnerable
mee-ironsoftware Jul 23, 2024
1470b37
Tests: Update to test NET4.8 instead of NET4.7.2
mee-ironsoftware Nov 14, 2024
46b26d4
Merge branch 'master' into releases/2024.12
mee-ironsoftware Nov 14, 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
12 changes: 6 additions & 6 deletions CI/stage_templates/run_tests_on_pool.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ stages:
- script: echo "Skip Unit tests"
- ${{ if eq(parameters.runUnitTests, true) }}:
- ${{ if eq(parameters.OSPlatform, 'Windows') }}:
# Windows .NET 472 x86 Tests
# Windows .NET 48 x86 Tests
- template: ../job_templates/test_drawing_libraries.yml
parameters:
name: UnitTest${{ parameters.OSPlatform }}net472x86
name: UnitTest${{ parameters.OSPlatform }}net48x86
OSPlatform: ${{ parameters.OSPlatform }}
framework: 'net472'
framework: 'net48'
architecture: '.x86'
buildConfiguration: $(Configuration)
# Windows .NET 472 x64 Tests
# Windows .NET 48 x64 Tests
- template: ../job_templates/test_drawing_libraries.yml
parameters:
name: UnitTest${{ parameters.OSPlatform }}net472x64
name: UnitTest${{ parameters.OSPlatform }}net48x64
OSPlatform: ${{ parameters.OSPlatform }}
framework: 'net472'
framework: 'net48'
architecture: ''
buildConfiguration: $(Configuration)
# .NET 8.0 Tests
Expand Down
2 changes: 1 addition & 1 deletion ...ftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net80</TargetFrameworks>
<TargetFrameworks>net48;net80</TargetFrameworks>
<LangVersion>latest</LangVersion>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<IsPackable>false</IsPackable>
Expand Down
4 changes: 2 additions & 2 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile>
Expand All @@ -25,7 +25,7 @@
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<PackageReference Include="IronSoftware.Common" Version="2024.9.38" />
<PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2024.11.8" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
Expand Down
6 changes: 3 additions & 3 deletions NuGet/IronSoftware.Drawing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,21 @@ For general support and technical inquiries, please email us at: support@ironsof
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="IronSoftware.Common" version="2024.9.38" />
<dependency id="IronSoftware.Drawing.Abstractions" version="2024.11.8" />
<dependency id="SixLabors.ImageSharp" version="2.1.9" />
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="net60">
<dependency id="IronSoftware.Common" version="2024.9.38" />
<dependency id="IronSoftware.Drawing.Abstractions" version="2024.11.8" />
<dependency id="SixLabors.ImageSharp" version="3.1.5" />
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.4" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="IronSoftware.Common" version="2024.9.38" />
<dependency id="IronSoftware.Drawing.Abstractions" version="2024.11.8" />
<dependency id="SixLabors.ImageSharp" version="2.1.9" />
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
Expand Down
Loading