Skip to content

Commit f501415

Browse files
4OTbIPE4OTbIPE
committed
Release 4.0
1 parent d3772c3 commit f501415

13 files changed

+61
-105
lines changed

‎Directory.Build.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Version>4.0.0</Version>
5+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
6+
<NoWarn>IDE0290</NoWarn>
7+
<DefaultLanguage>en</DefaultLanguage>
8+
<AssemblyName>ImageEx</AssemblyName>
9+
</PropertyGroup>
10+
11+
</Project>

‎ImageEx.sln

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.7.34221.43
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageEx", "ImageEx\ImageEx.csproj", "{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageEx_UWP", "ImageEx\ImageEx_UWP.csproj", "{C56EAB01-B12F-D51F-5F6C-8F6272D1E0AE}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageEx_WinUI", "ImageEx\ImageEx_WinUI.csproj", "{92AC5C55-9188-0A27-23E8-E5E4C43622DF}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
11-
Debug|ARM = Debug|ARM
12-
Debug|ARM64 = Debug|ARM64
13-
Debug|x64 = Debug|x64
14-
Debug|x86 = Debug|x86
1513
Release|Any CPU = Release|Any CPU
16-
Release|ARM = Release|ARM
17-
Release|ARM64 = Release|ARM64
18-
Release|x64 = Release|x64
19-
Release|x86 = Release|x86
2014
EndGlobalSection
2115
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|ARM.ActiveCfg = Debug|ARM
25-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|ARM.Build.0 = Debug|ARM
26-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|ARM64.ActiveCfg = Debug|ARM64
27-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|ARM64.Build.0 = Debug|ARM64
28-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|x64.ActiveCfg = Debug|x64
29-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|x64.Build.0 = Debug|x64
30-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|x86.ActiveCfg = Debug|x86
31-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Debug|x86.Build.0 = Debug|x86
32-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|ARM.ActiveCfg = Release|ARM
35-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|ARM.Build.0 = Release|ARM
36-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|ARM64.ActiveCfg = Release|ARM64
37-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|ARM64.Build.0 = Release|ARM64
38-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|x64.ActiveCfg = Release|x64
39-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|x64.Build.0 = Release|x64
40-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|x86.ActiveCfg = Release|x86
41-
{FFAA6C85-06E6-4D7E-9C7D-FB375DDC4667}.Release|x86.Build.0 = Release|x86
16+
{C56EAB01-B12F-D51F-5F6C-8F6272D1E0AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{C56EAB01-B12F-D51F-5F6C-8F6272D1E0AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{C56EAB01-B12F-D51F-5F6C-8F6272D1E0AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{C56EAB01-B12F-D51F-5F6C-8F6272D1E0AE}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{92AC5C55-9188-0A27-23E8-E5E4C43622DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{92AC5C55-9188-0A27-23E8-E5E4C43622DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4222
EndGlobalSection
4323
GlobalSection(SolutionProperties) = preSolution
4424
HideSolutionNode = FALSE

‎ImageEx/ImageEx.csproj

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎ImageEx/ImageExBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
4-
54
namespace ImageEx;
65

76
public static class Extensions

‎ImageEx/ImageEx_UWP.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net9.0-windows10.0.26100</TargetFrameworks>
5+
<OutputType>Library</OutputType>
6+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
7+
<UseUwp>true</UseUwp>
8+
<IsAotCompatible>true</IsAotCompatible>
9+
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
10+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<DefineConstants>WIN_UWP</DefineConstants>
12+
</PropertyGroup>
13+
14+
</Project>

‎ImageEx/ImageEx_WinUI.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0-windows10.0.22621</TargetFramework>
5+
<OutputType>Library</OutputType>
6+
<UseWinUI>true</UseWinUI>
7+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
8+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
9+
<IsAotCompatible>true</IsAotCompatible>
10+
<DebugType>embedded</DebugType>
11+
<DefineConstants>WINUI3</DefineConstants>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
16+
</ItemGroup>
17+
18+
</Project>

‎ImageEx/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ImageEx/Properties/ImageEx.rd.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
Этот файл содержит директивы среды выполнения, спецификации о типах, к которым получает доступ приложение
4-
через отражение, и другие динамические шаблоны кода. Директивы среды выполнения используются для управления
5-
оптимизатором .NET Native, а также чтобы не удалить код, к которому обращается ваша библиотека. Если
6-
библиотека не выполняет отражение, обычно изменять этот файл не нужно. Но
7-
если библиотека отражает типы (особенно типы, переданные в нее или наследуемые из ее типов),
8-
следует написать директивы среды выполнения.
92

10-
Чаще всего отражение используется в библиотеках для обнаружения информации о типах, переданных
11-
в библиотеку. У директив среды выполнения есть три способа выражения требований к типам, переданным в
12-
библиотеку.
13-
14-
1. Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
15-
Используйте эти директивы для отражения типов, переданных в виде параметров.
16-
17-
2. SubTypes
18-
Используйте директиву SubTypes для отражения типов, наследуемых из другого типа.
19-
20-
3. AttributeImplies
21-
Используйте директиву AttributeImplies, чтобы указать, что библиотеке необходимо отразить
22-
типы или методы, снабженные атрибутом.
23-
24-
Дополнительные сведения о написании директив среды выполнения для библиотек:
25-
https://go.microsoft.com/fwlink/?LinkID=391919
26-
.-->
273
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
284
<Library Name="ImageEx">
29-
30-
<!-- добавьте сюда директивы для своей библиотеки -->
31-
325
</Library>
336
</Directives>

‎ImageEx/Themes/Generic.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
32
<ResourceDictionary.MergedDictionaries>
43
<ResourceDictionary Source="ms-appx:///ImageEx/ImageEx.xaml" />
54
</ResourceDictionary.MergedDictionaries>

‎ImageEx/Usings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
global using System.Threading;
1111
global using System.Threading.Tasks;
1212

13-
#if WINDOWS_UWP || NETSTANDARD2_0
13+
#if WIN_UWP
1414
global using Windows.UI.Composition;
1515
global using Windows.UI.Xaml;
1616
global using Windows.UI.Xaml.Controls;
1717
global using Windows.UI.Xaml.Media;
1818
global using Windows.UI.Xaml.Media.Imaging;
1919
#endif
2020

21-
#if NETCOREAPP
21+
#if WINUI3
2222
global using Microsoft.UI.Composition;
2323
global using Microsoft.UI.Xaml;
2424
global using Microsoft.UI.Xaml.Controls;

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ Originally developed by Microsoft.Toolkit
99
https://github.com/CommunityToolkit/WindowsCommunityToolkit
1010

1111
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL FOURSOFT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12+
13+
# Nuget Packages:
14+
- For **Legacy UWP** (.NET Native) use https://www.nuget.org/packages/ImageEx.UWP - version 3.9
15+
- For **Modern UWP** (.NET 9+) use https://www.nuget.org/packages/ImageEx.UWP - version 4.0 *or later*
16+
- For **WinUI3** apps use https://www.nuget.org/packages/ImageEx.WinUI - version 4.0 *or later*
17+
- Old package (https://www.nuget.org/packages/ImageEx) is no longer supported

‎UWPLogo.png

249 KB
Loading

‎WinUILogo.png

236 KB
Loading

0 commit comments

Comments
 (0)