-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/migrate_to_new_csproj'
- Loading branch information
Showing
8 changed files
with
69 additions
and
178 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,154 +1,55 @@ | ||
| <?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>{061B1DD9-815B-437F-8CD6-D20923BC0AF4}</ProjectGuid> | ||
| <OutputType>library</OutputType> | ||
| <OutputType>Library</OutputType> | ||
| <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks> | ||
| <UseWPF>true</UseWPF> | ||
| <RootNamespace>SourceChord.FluentWPF</RootNamespace> | ||
| <AssemblyName>FluentWPF</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <WarningLevel>4</WarningLevel> | ||
| <TargetFrameworkProfile /> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>none</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <PropertyGroup> | ||
| <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> | ||
| <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> | ||
| <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> | ||
| <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> | ||
| <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> | ||
| <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> | ||
| <GenerateAssemblyTrademarkAttribute>false</GenerateAssemblyTrademarkAttribute> | ||
| <GenerateAssemblyCultureAttribute>false</GenerateAssemblyCultureAttribute> | ||
| <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> | ||
| <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute> | ||
|
|
||
| <PackageProjectUrl>https://github.com/sourcechord/FluentWPF</PackageProjectUrl> | ||
| <PackageIconUrl>https://raw.githubusercontent.com/sourcechord/FluentWPF/master/logo.png</PackageIconUrl> | ||
| <PackageTags>WPF XAML Fluent Design Theme Library</PackageTags> | ||
| <PackageLicenseFile>LICENSE</PackageLicenseFile> | ||
| <Version>0.8.0-alpha</Version> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <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.Net.Http" /> | ||
| <Reference Include="System.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="AcrylicContextMenu.cs" /> | ||
| <Compile Include="AcrylicPopup.cs" /> | ||
| <Compile Include="Animations\BrushAnimation.cs" /> | ||
| <Compile Include="Extensions.cs" /> | ||
| <Compile Include="Resources\ResourceDictionaryEx.cs" /> | ||
| <Compile Include="Resources\SystemTheme.cs" /> | ||
| <Compile Include="Resources\ThemeHandler.cs" /> | ||
| <Compile Include="Utility\AcrylicHelper.cs" /> | ||
| <Compile Include="Utility\IconHelper.cs" /> | ||
| <Compile Include="Utility\SystemInfo.cs" /> | ||
| <Compile Include="Utility\VersionInfo.cs" /> | ||
| <Compile Include="Utility\VersionInfos.cs" /> | ||
| <Page Include="Styles\Button.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\Brushes.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\Colors.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\Controls.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\ListBox.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\Menu.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\ScrollBar.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\TextBox.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Styles\Window.xaml"> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </Page> | ||
| <Page Include="Themes\Generic.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Compile Include="Resources\AccentColors.cs" /> | ||
| <Compile Include="AcrylicBrush.cs" /> | ||
| <Compile Include="AcrylicPanel.cs" /> | ||
| <Compile Include="AcrylicWindow.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="DropShadowPanel.cs" /> | ||
| <Compile Include="ParallaxView.cs" /> | ||
| <Compile Include="PointerTracker.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="FluentWPF.nuspec" /> | ||
| <None Include="Properties\Settings.settings"> | ||
| <Generator>SettingsSingleFileGenerator</Generator> | ||
| <LastGenOutput>Settings.Designer.cs</LastGenOutput> | ||
| <None Remove="Assets\Images\noise.png" /> | ||
| <None Remove="Assets\Images\noiseBlack.png" /> | ||
| <None Remove="Assets\Images\noiseWhite.png" /> | ||
| <None Remove="Styles\Brushes.xaml" /> | ||
| <None Remove="Styles\Button.xaml" /> | ||
| <None Remove="Styles\Colors.Dark.xaml" /> | ||
| <None Remove="Styles\Colors.Light.xaml" /> | ||
| <None Remove="Styles\Colors.xaml" /> | ||
| <None Remove="Styles\Controls.xaml" /> | ||
| <None Remove="Styles\ListBox.xaml" /> | ||
| <None Remove="Styles\Menu.xaml" /> | ||
| <None Remove="Styles\ScrollBar.xaml" /> | ||
| <None Remove="Styles\TextBox.xaml" /> | ||
| <None Remove="Styles\Window.xaml" /> | ||
| <None Remove="Themes\Generic.xaml" /> | ||
| <None Include="..\LICENSE"> | ||
| <Pack>True</Pack> | ||
| <PackagePath></PackagePath> | ||
| </None> | ||
| <Page Include="Styles\Colors.Dark.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="Styles\Colors.Light.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Resource Include="Assets\Images\noise.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Resource Include="Assets\Images\noiseWhite.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Resource Include="Assets\Images\noiseBlack.png" /> | ||
| <Resource Include="Assets\Images\noiseWhite.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup /> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,2 +1,5 @@ | ||
| nuget pack ..\FluentWPF\FluentWPF.csproj -Build -Properties Configuration=Release | ||
| set OutDir=%CD% | ||
| pushd ..\FluentWPF | ||
| dotnet pack -c Release -o %OutDir% | ||
| popd | ||
| pause |
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