Skip to content

Commit 5ed4af4

Browse files
sourcechordsourcechord
committed
Merge branch 'feature/migrate_to_new_csproj'
2 parents 4ae8df6 + 1349180 commit 5ed4af4

File tree

8 files changed

+69
-178
lines changed

8 files changed

+69
-178
lines changed

‎FluentWPF.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2005
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28917.181
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentWPF", "FluentWPF\FluentWPF.csproj", "{061B1DD9-815B-437F-8CD6-D20923BC0AF4}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{6FD229DB-B096-4A05-A025-88D06AE274B9}"
97
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentWPFSample", "Sample\FluentWPFSample\FluentWPFSample.csproj", "{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}"
@@ -14,18 +12,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{76CF6319
1412
Nuget\pack.bat = Nuget\pack.bat
1513
EndProjectSection
1614
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCoreSample", "Sample\NetCoreSample\NetCoreSample.csproj", "{4E60C7EA-CC99-4D22-AE70-4461015C10E5}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCoreSample", "Sample\NetCoreSample\NetCoreSample.csproj", "{4E60C7EA-CC99-4D22-AE70-4461015C10E5}"
16+
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentWPF", "FluentWPF\FluentWPF.csproj", "{0EFDC126-556C-431D-B0DF-BACB8AB445B6}"
1818
EndProject
1919
Global
2020
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2121
Debug|Any CPU = Debug|Any CPU
2222
Release|Any CPU = Release|Any CPU
2323
EndGlobalSection
2424
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Release|Any CPU.Build.0 = Release|Any CPU
2925
{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3026
{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Debug|Any CPU.Build.0 = Debug|Any CPU
3127
{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -34,6 +30,10 @@ Global
3430
{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
3531
{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
3632
{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Release|Any CPU.Build.0 = Release|Any CPU
3737
EndGlobalSection
3838
GlobalSection(SolutionProperties) = preSolution
3939
HideSolutionNode = FALSE

‎FluentWPF/FluentWPF.csproj

Lines changed: 43 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,55 @@
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.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{061B1DD9-815B-437F-8CD6-D20923BC0AF4}</ProjectGuid>
8-
<OutputType>library</OutputType>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
6+
<UseWPF>true</UseWPF>
97
<RootNamespace>SourceChord.FluentWPF</RootNamespace>
10-
<AssemblyName>FluentWPF</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<TargetFrameworkProfile />
168
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>none</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
9+
<PropertyGroup>
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16+
<GenerateAssemblyTrademarkAttribute>false</GenerateAssemblyTrademarkAttribute>
17+
<GenerateAssemblyCultureAttribute>false</GenerateAssemblyCultureAttribute>
18+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
20+
21+
<PackageProjectUrl>https://github.com/sourcechord/FluentWPF</PackageProjectUrl>
22+
<PackageIconUrl>https://raw.githubusercontent.com/sourcechord/FluentWPF/master/logo.png</PackageIconUrl>
23+
<PackageTags>WPF XAML Fluent Design Theme Library</PackageTags>
24+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
25+
<Version>0.8.0-alpha</Version>
3326
</PropertyGroup>
3427
<ItemGroup>
35-
<Reference Include="System" />
36-
<Reference Include="System.Data" />
37-
<Reference Include="System.Xml" />
38-
<Reference Include="Microsoft.CSharp" />
39-
<Reference Include="System.Core" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Xaml">
44-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
45-
</Reference>
46-
<Reference Include="WindowsBase" />
47-
<Reference Include="PresentationCore" />
48-
<Reference Include="PresentationFramework" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="AcrylicContextMenu.cs" />
52-
<Compile Include="AcrylicPopup.cs" />
53-
<Compile Include="Animations\BrushAnimation.cs" />
54-
<Compile Include="Extensions.cs" />
55-
<Compile Include="Resources\ResourceDictionaryEx.cs" />
56-
<Compile Include="Resources\SystemTheme.cs" />
57-
<Compile Include="Resources\ThemeHandler.cs" />
58-
<Compile Include="Utility\AcrylicHelper.cs" />
59-
<Compile Include="Utility\IconHelper.cs" />
60-
<Compile Include="Utility\SystemInfo.cs" />
61-
<Compile Include="Utility\VersionInfo.cs" />
62-
<Compile Include="Utility\VersionInfos.cs" />
63-
<Page Include="Styles\Button.xaml">
64-
<SubType>Designer</SubType>
65-
<Generator>MSBuild:Compile</Generator>
66-
</Page>
67-
<Page Include="Styles\Brushes.xaml">
68-
<SubType>Designer</SubType>
69-
<Generator>MSBuild:Compile</Generator>
70-
</Page>
71-
<Page Include="Styles\Colors.xaml">
72-
<SubType>Designer</SubType>
73-
<Generator>MSBuild:Compile</Generator>
74-
</Page>
75-
<Page Include="Styles\Controls.xaml">
76-
<SubType>Designer</SubType>
77-
<Generator>MSBuild:Compile</Generator>
78-
</Page>
79-
<Page Include="Styles\ListBox.xaml">
80-
<SubType>Designer</SubType>
81-
<Generator>MSBuild:Compile</Generator>
82-
</Page>
83-
<Page Include="Styles\Menu.xaml">
84-
<SubType>Designer</SubType>
85-
<Generator>MSBuild:Compile</Generator>
86-
</Page>
87-
<Page Include="Styles\ScrollBar.xaml">
88-
<SubType>Designer</SubType>
89-
<Generator>MSBuild:Compile</Generator>
90-
</Page>
91-
<Page Include="Styles\TextBox.xaml">
92-
<SubType>Designer</SubType>
93-
<Generator>MSBuild:Compile</Generator>
94-
</Page>
95-
<Page Include="Styles\Window.xaml">
96-
<SubType>Designer</SubType>
97-
<Generator>MSBuild:Compile</Generator>
98-
</Page>
99-
<Page Include="Themes\Generic.xaml">
100-
<Generator>MSBuild:Compile</Generator>
101-
<SubType>Designer</SubType>
102-
</Page>
103-
<Compile Include="Resources\AccentColors.cs" />
104-
<Compile Include="AcrylicBrush.cs" />
105-
<Compile Include="AcrylicPanel.cs" />
106-
<Compile Include="AcrylicWindow.cs" />
107-
</ItemGroup>
108-
<ItemGroup>
109-
<Compile Include="DropShadowPanel.cs" />
110-
<Compile Include="ParallaxView.cs" />
111-
<Compile Include="PointerTracker.cs" />
112-
<Compile Include="Properties\AssemblyInfo.cs">
113-
<SubType>Code</SubType>
114-
</Compile>
115-
<Compile Include="Properties\Resources.Designer.cs">
116-
<AutoGen>True</AutoGen>
117-
<DesignTime>True</DesignTime>
118-
<DependentUpon>Resources.resx</DependentUpon>
119-
</Compile>
120-
<Compile Include="Properties\Settings.Designer.cs">
121-
<AutoGen>True</AutoGen>
122-
<DependentUpon>Settings.settings</DependentUpon>
123-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
124-
</Compile>
125-
<EmbeddedResource Include="Properties\Resources.resx">
126-
<Generator>ResXFileCodeGenerator</Generator>
127-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
128-
</EmbeddedResource>
129-
<None Include="FluentWPF.nuspec" />
130-
<None Include="Properties\Settings.settings">
131-
<Generator>SettingsSingleFileGenerator</Generator>
132-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
28+
<None Remove="Assets\Images\noise.png" />
29+
<None Remove="Assets\Images\noiseBlack.png" />
30+
<None Remove="Assets\Images\noiseWhite.png" />
31+
<None Remove="Styles\Brushes.xaml" />
32+
<None Remove="Styles\Button.xaml" />
33+
<None Remove="Styles\Colors.Dark.xaml" />
34+
<None Remove="Styles\Colors.Light.xaml" />
35+
<None Remove="Styles\Colors.xaml" />
36+
<None Remove="Styles\Controls.xaml" />
37+
<None Remove="Styles\ListBox.xaml" />
38+
<None Remove="Styles\Menu.xaml" />
39+
<None Remove="Styles\ScrollBar.xaml" />
40+
<None Remove="Styles\TextBox.xaml" />
41+
<None Remove="Styles\Window.xaml" />
42+
<None Remove="Themes\Generic.xaml" />
43+
<None Include="..\LICENSE">
44+
<Pack>True</Pack>
45+
<PackagePath></PackagePath>
13346
</None>
134-
<Page Include="Styles\Colors.Dark.xaml">
135-
<Generator>MSBuild:Compile</Generator>
136-
<SubType>Designer</SubType>
137-
</Page>
138-
<Page Include="Styles\Colors.Light.xaml">
139-
<Generator>MSBuild:Compile</Generator>
140-
<SubType>Designer</SubType>
141-
</Page>
14247
</ItemGroup>
48+
14349
<ItemGroup>
14450
<Resource Include="Assets\Images\noise.png" />
145-
</ItemGroup>
146-
<ItemGroup>
147-
<Resource Include="Assets\Images\noiseWhite.png" />
148-
</ItemGroup>
149-
<ItemGroup>
15051
<Resource Include="Assets\Images\noiseBlack.png" />
52+
<Resource Include="Assets\Images\noiseWhite.png" />
15153
</ItemGroup>
152-
<ItemGroup />
153-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54+
15455
</Project>

‎FluentWPF/FluentWPF.nuspec

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

‎FluentWPF/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
5252
// 既定値にすることができます:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("0.7.0.0")]
55-
[assembly: AssemblyFileVersion("0.7.0.0")]
54+
[assembly: AssemblyVersion("0.8.0.0")]
55+
[assembly: AssemblyFileVersion("0.8.0.0")]

‎FluentWPF/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Nuget/pack.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
nuget pack ..\FluentWPF\FluentWPF.csproj -Build -Properties Configuration=Release
1+
set OutDir=%CD%
2+
pushd ..\FluentWPF
3+
dotnet pack -c Release -o %OutDir%
4+
popd
25
pause

‎Sample/FluentWPFSample/FluentWPFSample.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,17 +198,17 @@
198198
<ItemGroup>
199199
<None Include="App.config" />
200200
</ItemGroup>
201-
<ItemGroup>
202-
<ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj">
203-
<Project>{061b1dd9-815b-437f-8cd6-d20923bc0af4}</Project>
204-
<Name>FluentWPF</Name>
205-
</ProjectReference>
206-
</ItemGroup>
207201
<ItemGroup>
208202
<Resource Include="Assets\Images\1.jpg" />
209203
</ItemGroup>
210204
<ItemGroup>
211205
<Resource Include="Assets\Images\logo_icon.png" />
212206
</ItemGroup>
207+
<ItemGroup>
208+
<ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj">
209+
<Project>{0efdc126-556c-431d-b0df-bacb8ab445b6}</Project>
210+
<Name>FluentWPF</Name>
211+
</ProjectReference>
212+
</ItemGroup>
213213
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
214214
</Project>

‎Sample/NetCoreSample/NetCoreSample.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<UseWPF>true</UseWPF>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<PlatformTarget></PlatformTarget>
11+
</PropertyGroup>
12+
913
<ItemGroup>
1014
<ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj" />
1115
</ItemGroup>

0 commit comments

Comments
 (0)