-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop'
- Loading branch information
Showing
16 changed files
with
950 additions
and
485 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,25 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Wif.Core\Wif.Core.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Infrastructure\Wif.Infrastructure.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)'=='net472'"> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="WindowsBase" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net462;net472;net6.0-windows;net8.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Wif.Core\Wif.Core.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Infrastructure\Wif.Infrastructure.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net462'))"> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="WindowsBase" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,44 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)'=='net472'"> | ||
| <Reference Include="PresentationFramework.Aero2" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Configuration" /> | ||
| <Reference Include="System.Data" /> | ||
| <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.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" /> | ||
| <PackageReference Include="System.Reactive" Version="5.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Wif.Core\Wif.Core.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Infrastructure\Wif.Infrastructure.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| <ProjectReference Include="..\Wif.Demo.Common\Wif.Demo.Common.csproj" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFrameworks>net462;net472;net6.0-windows;net8.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net462'))"> | ||
| <Reference Include="PresentationFramework.Aero2" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Configuration" /> | ||
| <Reference Include="System.Data" /> | ||
| <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.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" /> | ||
| <PackageReference Include="System.Reactive" Version="5.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Wif.Core\Wif.Core.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Infrastructure\Wif.Infrastructure.csproj" /> | ||
| <ProjectReference Include="..\..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| <ProjectReference Include="..\Wif.Demo.Common\Wif.Demo.Common.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,53 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <RootNamespace>Frontier.Wif.Core</RootNamespace> | ||
| <Version>0.3.0.21286</Version> | ||
| <Authors>LeoYang-Chuese</Authors> | ||
| <Description>WPF Infrastructure Framework（WIF）is an infrastructure framework that helps you develop WPF applications quickly.</Description> | ||
| <Copyright>Copyright © 2021 LeoYang-Chuese. All rights reserved.</Copyright> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageProjectUrl>https://github.com/LeoYang-Chuese/wif</PackageProjectUrl> | ||
| <PackageIcon>wif_logo.png</PackageIcon> | ||
| <RepositoryUrl>https://github.com/LeoYang-Chuese/wif.git</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <PackageTags>WPF;UI;Infrastructure;Utilities;Modern;XAML;Toolkit;Library;.NET;OpenSource</PackageTags> | ||
| <PackageReleaseNotes>https://github.com/LeoYang-Chuese/wif/releases</PackageReleaseNotes> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| <DocumentationFile>..\Output\Debug\Wif.Core.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| <DocumentationFile>..\Output\Release\Wif.Core.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)'=='net472'"> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="WindowsBase" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\..\Resources\Images\wif_logo.png"> | ||
| <Pack>True</Pack> | ||
| <PackagePath></PackagePath> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="WpfAnalyzers" Version="3.5.2"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net462;net472;net6.0-windows;net8.0-windows</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <RootNamespace>Frontier.Wif.Core</RootNamespace> | ||
| <Version>0.4.0.24100</Version> | ||
| <Authors>LeoYang-Chuese</Authors> | ||
| <Description>WPF Infrastructure Framework（WIF）is an infrastructure framework that helps you develop WPF applications quickly.</Description> | ||
| <Copyright>Copyright © 2021 LeoYang-Chuese. All rights reserved.</Copyright> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageProjectUrl>https://github.com/LeoYang-Chuese/wif</PackageProjectUrl> | ||
| <PackageIcon>wif_logo.png</PackageIcon> | ||
| <RepositoryUrl>https://github.com/LeoYang-Chuese/wif.git</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <PackageTags>WPF;UI;Infrastructure;Utilities;Modern;XAML;Toolkit;Library;.NET;OpenSource</PackageTags> | ||
| <PackageReleaseNotes>https://github.com/LeoYang-Chuese/wif/releases</PackageReleaseNotes> | ||
| <LangVersion>default</LangVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <OutputPath>..\Output\Debug\</OutputPath> | ||
| <DocumentationFile>..\Output\Debug\Wif.Core.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <OutputPath>..\Output\Release\</OutputPath> | ||
| <DocumentationFile>..\Output\Release\Wif.Core.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows|AnyCPU'"> | ||
| <WarningLevel>7</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows|AnyCPU'"> | ||
| <WarningLevel>7</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Wif.Utilities\Wif.Utilities.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net462'))"> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="WindowsBase" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\..\Resources\Images\wif_logo.png"> | ||
| <Pack>True</Pack> | ||
| <PackagePath></PackagePath> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="WpfAnalyzers" Version="3.5.2"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
| </Project> |
Oops, something went wrong.