Skip to content

Commit abffc1e

Browse files
usercodeusercode
authored
Merge pull request #1 from MrBean2016/master
Updated to .Net 5
2 parents bb2886b + 1f1386f commit abffc1e

File tree

4 files changed

+19
-146
lines changed

4 files changed

+19
-146
lines changed

‎src/WPF.ImageEffects.Demo/MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:imageeffects="http://usercode.de/wpf.imageeffects"
6+
xmlns:imageeffects="clr-namespace:WPF.ImageEffects;assembly=WPF.ImageEffects"
77
xmlns:local="clr-namespace:WPF.ImageEffects.Demo"
88
mc:Ignorable="d"
99
Title="MainWindow" Height="600" Width="800">

‎src/WPF.ImageEffects.Demo/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public MainWindow()
2626

2727
BitmapImage img = new BitmapImage();
2828
img.BeginInit();
29-
img.UriSource = new Uri("pack://application:,,,/WPF.ImageEffects.Demo;component/photo.jpeg");
29+
img.UriSource = new Uri("pack://application:,,,/photo.jpeg");
3030
img.EndInit();
3131

3232
image.Source = img;

‎src/WPF.ImageEffects.Demo/WPF.ImageEffects.Demo.csproj‎

Lines changed: 12 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{17741CEB-F70F-4F11-85D2-7A632B0AFCDC}</ProjectGuid>
84
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
98
<RootNamespace>WPF.ImageEffects.Demo</RootNamespace>
109
<AssemblyName>WPF.ImageEffects.Demo</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16-
<TargetFrameworkProfile />
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
3610
</PropertyGroup>
11+
3712
<ItemGroup>
38-
<Reference Include="System" />
39-
<Reference Include="System.Data" />
40-
<Reference Include="System.Xml" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Xml.Linq" />
44-
<Reference Include="System.Data.DataSetExtensions" />
45-
<Reference Include="System.Net.Http" />
46-
<Reference Include="System.Xaml">
47-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
48-
</Reference>
49-
<Reference Include="WindowsBase" />
50-
<Reference Include="PresentationCore" />
51-
<Reference Include="PresentationFramework" />
13+
<None Remove="photo.jpeg" />
5214
</ItemGroup>
15+
5316
<ItemGroup>
54-
<ApplicationDefinition Include="App.xaml">
55-
<Generator>MSBuild:Compile</Generator>
56-
<SubType>Designer</SubType>
57-
</ApplicationDefinition>
58-
<Page Include="MainWindow.xaml">
59-
<Generator>MSBuild:Compile</Generator>
60-
<SubType>Designer</SubType>
61-
</Page>
62-
<Compile Include="App.xaml.cs">
63-
<DependentUpon>App.xaml</DependentUpon>
64-
<SubType>Code</SubType>
65-
</Compile>
66-
<Compile Include="MainWindow.xaml.cs">
67-
<DependentUpon>MainWindow.xaml</DependentUpon>
68-
<SubType>Code</SubType>
69-
</Compile>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<Compile Include="Properties\AssemblyInfo.cs">
73-
<SubType>Code</SubType>
74-
</Compile>
75-
<Compile Include="Properties\Resources.Designer.cs">
76-
<AutoGen>True</AutoGen>
77-
<DesignTime>True</DesignTime>
78-
<DependentUpon>Resources.resx</DependentUpon>
79-
</Compile>
80-
<Compile Include="Properties\Settings.Designer.cs">
81-
<AutoGen>True</AutoGen>
82-
<DependentUpon>Settings.settings</DependentUpon>
83-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
84-
</Compile>
85-
<EmbeddedResource Include="Properties\Resources.resx">
86-
<Generator>ResXFileCodeGenerator</Generator>
87-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
88-
</EmbeddedResource>
89-
<None Include="Properties\Settings.settings">
90-
<Generator>SettingsSingleFileGenerator</Generator>
91-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
92-
</None>
93-
</ItemGroup>
94-
<ItemGroup>
95-
<None Include="App.config" />
96-
</ItemGroup>
97-
<ItemGroup>
98-
<ProjectReference Include="..\WPF.ImageEffects\WPF.ImageEffects.csproj">
99-
<Project>{331d484a-cb98-4c80-b6d4-e71c0141a6f3}</Project>
100-
<Name>WPF.ImageEffects</Name>
101-
</ProjectReference>
17+
<ProjectReference Include="..\WPF.ImageEffects\WPF.ImageEffects.csproj" />
10218
</ItemGroup>
19+
10320
<ItemGroup>
10421
<Resource Include="photo.jpeg" />
105-
</ItemGroup>
106-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
107-
</Project>
22+
</ItemGroup>
23+
</Project>

‎src/WPF.ImageEffects/WPF.ImageEffects.csproj‎

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{331D484A-CB98-4C80-B6D4-E71C0141A6F3}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net5.0-windows</TargetFramework>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
105
<RootNamespace>WPF.ImageEffects</RootNamespace>
116
<AssemblyName>WPF.ImageEffects</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
7+
<UseWPF>true</UseWPF>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="PresentationCore" />
35-
<Reference Include="PresentationFramework" />
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xaml" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Xml" />
45-
<Reference Include="WindowsBase" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="BrightnessContrastEffect.cs" />
49-
<Compile Include="Properties\AssemblyInfo.cs" />
50-
</ItemGroup>
519
<ItemGroup>
5210
<Content Include="Shaders\ImageShader.fx" />
5311
</ItemGroup>
5412
<ItemGroup>
5513
<Resource Include="Shaders\ImageShader.fxc" />
5614
</ItemGroup>
57-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5815
</Project>

0 commit comments

Comments
 (0)