Skip to content

Commit

Permalink
Upgrade project file to multi-framework version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@x-stars
x-stars committed Apr 3, 2020
1 parent fae75a3 commit 2042166
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 368 deletions.
6 changes: 0 additions & 6 deletions ImageQuality/App.config
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ImageQuality/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:XstarS.ImageQuality"
StartupUri="Views\MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>
151 changes: 47 additions & 104 deletions ImageQuality/ImageQuality.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3C5C3B2E-1D4C-4AF2-A0AE-627C879FEB9A}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>XstarS.ImageQuality</RootNamespace>
<AssemblyName>ImageQuality</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<UseWPF>true</UseWPF>
<RootNamespace>XstarS.$(AssemblyName)</RootNamespace>
<TargetFrameworks>net461;net472;netcoreapp3.1</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\Debug\ImageQuality.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>

<PropertyGroup>
<Authors>XstarS</Authors>
<Company>XstarS</Company>
<Version>1.1.0</Version>
<Product>$(AssemblyName)</Product>
<Description>$(AssemblyName)</Description>
<Copyright>Copyright © $(Company) 2018</Copyright>
</PropertyGroup>

<PropertyGroup>
<PackageId>$(AssemblyName)</PackageId>
<PackageVersion>$(Version)</PackageVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/x-stars/ImageQuality</PackageProjectUrl>
<PackageIconUrl></PackageIconUrl>
<RepositoryUrl>https://github.com/x-stars/ImageQuality</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>
obj\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\Release\ImageQuality.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />

<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Views\ImagePairAddWindowModel.cs" />
<Compile Include="Views\MainWindowModel.cs" />
<Compile Include="Views\ImagePairAddWindow.xaml.cs">
<DependentUpon>ImagePairAddWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Views\MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
</Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Helpers\PathHelper.cs" />
<Page Include="Views\ImagePairAddWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MainWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Models\ImagePair.cs" />
<Compile Include="Models\AutoReloadCache.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<Reference Include="System.Drawing" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />

<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

</Project>
46 changes: 3 additions & 43 deletions ImageQuality/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,8 @@
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;
using System;
using System.Windows;

// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("图像质量评估")]
[assembly: AssemblyDescription("使用客观评估算法的图像质量评估工具")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("天南十字星")]
[assembly: AssemblyProduct("图像质量评估")]
[assembly: AssemblyCopyright("Copyright © 天南十字星 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]

//若要开始生成可本地化的应用程序，请设置
//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
//例如，如果您在源文件中使用的是美国英语，
//使用的是美国英语，请将 <UICulture> 设置为 en-US。 然后取消
//对以下 NeutralResourceLanguage 特性的注释。 更新
//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: NeutralResourcesLanguage("zh-CN")]

// 指示程序元素是否使用公共语言规范进行编译。
[assembly: CLSCompliant(true)]

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //主题特定资源词典所处位置
Expand All @@ -38,17 +12,3 @@
//(未在页面中找到资源时使用，
//、应用程序或任何主题专用资源字典中找到时使用)
)]


// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
63 changes: 0 additions & 63 deletions ImageQuality/Properties/Resources.Designer.cs
View file

This file was deleted.

Loading

0 comments on commit 2042166

Please sign in to comment.