From 7ae90eb7c502df24ce25932991420be757ef3b3b Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Fri, 4 May 2018 20:07:53 +0800 Subject: [PATCH 01/15] Cleanup all the csproj's that can be cleaned. Ported RenderTest and VirtualizationTest samples to .NET Core. --- build/Base.props | 2 +- samples/RenderTest/Properties/AssemblyInfo.cs | 36 ---- samples/RenderTest/RenderTest.csproj | 201 ++---------------- .../Properties/AssemblyInfo.cs | 36 ---- .../VirtualizationTest.csproj | 166 ++------------- .../Avalonia.Animation.csproj | 29 +-- .../Properties/AssemblyInfo.cs | 6 - .../{Properties => }/AssemblyInfo.cs | 1 - src/Avalonia.Base/Avalonia.Base.csproj | 30 +-- .../{Properties => }/AssemblyInfo.cs | 1 - .../Avalonia.Controls.csproj | 30 +-- .../Properties/AssemblyInfo.cs | 8 - .../Avalonia.Diagnostics.csproj | 37 +--- .../Properties/AssemblyInfo.cs | 6 - .../Avalonia.DotNetCoreRuntime.csproj | 6 +- .../Properties/AssemblyInfo.cs | 6 - .../Avalonia.DotNetFrameworkRuntime.csproj | 6 +- .../Avalonia.HtmlRenderer.csproj | 115 +--------- .../{Properties => }/AssemblyInfo.cs | 1 - src/Avalonia.Input/Avalonia.Input.csproj | 30 +-- .../Avalonia.Interactivity.csproj | 34 +-- .../Properties/AssemblyInfo.cs | 6 - src/Avalonia.Layout/Avalonia.Layout.csproj | 30 +-- .../Properties/AssemblyInfo.cs | 6 - .../Avalonia.Logging.Serilog.csproj | 26 +-- .../Properties/AssemblyInfo.cs | 3 - .../Avalonia.ReactiveUI.csproj | 4 +- .../Properties/AssemblyInfo.cs | 6 - .../{Properties => }/AssemblyInfo.cs | 1 - src/Avalonia.Styling/Avalonia.Styling.csproj | 30 +-- .../Avalonia.Themes.Default.csproj | 34 +-- .../Properties/AssemblyInfo.cs | 6 - .../{Properties => }/AssemblyInfo.cs | 1 - src/Avalonia.Visuals/Avalonia.Visuals.csproj | 29 +-- .../{Properties => }/AssemblyInfo.cs | 2 - src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj | 24 +-- .../Avalonia.LinuxFramebuffer.csproj | 1 + .../Avalonia.MonoMac/Avalonia.MonoMac.csproj | 2 +- src/Shared/CompileXaml.props | 11 + src/Shared/Shared.props | 11 + src/Skia/Avalonia.Skia/Avalonia.Skia.csproj | 10 +- 41 files changed, 105 insertions(+), 925 deletions(-) delete mode 100644 samples/RenderTest/Properties/AssemblyInfo.cs delete mode 100644 samples/VirtualizationTest/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.Animation/Properties/AssemblyInfo.cs rename src/Avalonia.Base/{Properties => }/AssemblyInfo.cs (77%) rename src/Avalonia.Controls/{Properties => }/AssemblyInfo.cs (92%) delete mode 100644 src/Avalonia.DesignerSupport/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.Diagnostics/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs rename src/Avalonia.Input/{Properties => }/AssemblyInfo.cs (87%) delete mode 100644 src/Avalonia.Interactivity/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.Layout/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.Logging.Serilog/Properties/AssemblyInfo.cs delete mode 100644 src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs rename src/Avalonia.Styling/{Properties => }/AssemblyInfo.cs (82%) delete mode 100644 src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs rename src/Avalonia.Visuals/{Properties => }/AssemblyInfo.cs (85%) rename src/Gtk/Avalonia.Gtk3/{Properties => }/AssemblyInfo.cs (84%) create mode 100644 src/Shared/CompileXaml.props create mode 100644 src/Shared/Shared.props diff --git a/build/Base.props b/build/Base.props index 6689465338..78930156e7 100644 --- a/build/Base.props +++ b/build/Base.props @@ -2,4 +2,4 @@ - + \ No newline at end of file diff --git a/samples/RenderTest/Properties/AssemblyInfo.cs b/samples/RenderTest/Properties/AssemblyInfo.cs deleted file mode 100644 index f66c158075..0000000000 --- a/samples/RenderTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RenderTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RenderTest")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f1fdc5b0-4654-416f-ae69-e3e9bbd87801")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index b33d5d3c70..4373e4715a 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -1,184 +1,29 @@ - - - + - Debug - AnyCPU - {F1FDC5B0-4654-416F-AE69-E3E9BBD87801} - WinExe - Properties - RenderTest - RenderTest - v4.7 - 512 - true - + Exe + netcoreapp2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - App.xaml - - - DrawingPage.xaml - - - ClippingPage.xaml - - - AnimationsPage.xaml - - - - - MainWindow.xaml - - - - - - - - - Designer - - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Avalonia.DesignerSupport - - - {7062ae20-5dcc-4442-9645-8195bdece63e} - Avalonia.Diagnostics - - - {4a1abb09-9047-4bd5-a4ad-a055e52c5ee0} - Avalonia.DotNetFrameworkRuntime - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {b61b66a3-b82d-4875-8001-89d3394fe0c9} - Avalonia.Logging.Serilog - - - {6417b24e-49c2-4985-8db2-3ab9d898ec91} - Avalonia.ReactiveUI - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f} - Avalonia.Themes.Default - - - {3e53a01a-b331-47f3-b828-4a5717e77a24} - Avalonia.Markup.Xaml - - - {6417e941-21bc-467b-a771-0de389353ce6} - Avalonia.Markup - - - {7d2d3083-71dd-4cc9-8907-39a0d86fb322} - Avalonia.Skia - - - {3e908f67-5543-4879-a1dc-08eace79b3cd} - Avalonia.Direct2D1 - - - {811a76cf-1cf6-440f-963b-bbe31bd72a82} - Avalonia.Win32 - - - - - Designer - - - - - Designer - - - - - Designer - - - - - Designer - - - - - Designer - - - + + + + + + + + + + + + + + + + + + + + diff --git a/samples/VirtualizationTest/Properties/AssemblyInfo.cs b/samples/VirtualizationTest/Properties/AssemblyInfo.cs deleted file mode 100644 index e6af64555b..0000000000 --- a/samples/VirtualizationTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("VirtualizationTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VirtualizationTest")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("fbcaf3d0-2808-4934-8e96-3f607594517b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 0d498d827f..180c8dd48d 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -1,151 +1,29 @@ - - - + - Debug - AnyCPU - {FBCAF3D0-2808-4934-8E96-3F607594517B} - WinExe - Properties - VirtualizationTest - VirtualizationTest - v4.7 - 512 - true - + Exe + netcoreapp2.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - App.xaml - - - MainWindow.xaml - - - - - - - - - - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Avalonia.DesignerSupport - - - {7062ae20-5dcc-4442-9645-8195bdece63e} - Avalonia.Diagnostics - - - {4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0} - Avalonia.DotNetFrameworkRuntime - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {B61B66A3-B82D-4875-8001-89D3394FE0C9} - Avalonia.Logging.Serilog - - - {6417b24e-49c2-4985-8db2-3ab9d898ec91} - Avalonia.ReactiveUI - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f} - Avalonia.Themes.Default - - - {3e53a01a-b331-47f3-b828-4a5717e77a24} - Avalonia.Markup.Xaml - - - {6417e941-21bc-467b-a771-0de389353ce6} - Avalonia.Markup - - - {3e908f67-5543-4879-a1dc-08eace79b3cd} - Avalonia.Direct2D1 - - - {811a76cf-1cf6-440f-963b-bbe31bd72a82} - Avalonia.Win32 - - - - - Designer - - - - Designer - + + + + + + + + + + + + + + + + + - + + diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 2101c5669d..6627fdf952 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -1,37 +1,10 @@  netstandard2.0 - false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Animation.xml - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Animation.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - + \ No newline at end of file diff --git a/src/Avalonia.Animation/Properties/AssemblyInfo.cs b/src/Avalonia.Animation/Properties/AssemblyInfo.cs deleted file mode 100644 index a41edcc7b1..0000000000 --- a/src/Avalonia.Animation/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Animation")] diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/AssemblyInfo.cs similarity index 77% rename from src/Avalonia.Base/Properties/AssemblyInfo.cs rename to src/Avalonia.Base/AssemblyInfo.cs index 2ee7378413..0a276aa2aa 100644 --- a/src/Avalonia.Base/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Base/AssemblyInfo.cs @@ -4,7 +4,6 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("Avalonia.Base")] [assembly: InternalsVisibleTo("Avalonia.Base.UnitTests")] [assembly: InternalsVisibleTo("Avalonia.UnitTests")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 54537841a9..599374f75a 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -1,36 +1,10 @@  netstandard2.0 - false + Avalonia.Base Avalonia - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Base.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Base.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - + diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/AssemblyInfo.cs similarity index 92% rename from src/Avalonia.Controls/Properties/AssemblyInfo.cs rename to src/Avalonia.Controls/AssemblyInfo.cs index ae8c88f7e8..3466119411 100644 --- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Controls/AssemblyInfo.cs @@ -5,7 +5,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using Avalonia.Metadata; -[assembly: AssemblyTitle("Avalonia.Controls")] [assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")] [assembly: InternalsVisibleTo("Avalonia.DesignerSupport")] diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 997e15050f..e50625a4c4 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,35 +1,8 @@  netstandard2.0 - false + Avalonia.Controls - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Controls.xml - CS1591;CS0067 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Controls.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - @@ -40,6 +13,7 @@ + \ No newline at end of file diff --git a/src/Avalonia.DesignerSupport/Properties/AssemblyInfo.cs b/src/Avalonia.DesignerSupport/Properties/AssemblyInfo.cs deleted file mode 100644 index 1c43bc6d1f..0000000000 --- a/src/Avalonia.DesignerSupport/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; -using Avalonia.Metadata; - -[assembly: AssemblyTitle("Avalonia.Application")] -[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")] diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 5f8e25269b..59ed1685f4 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -1,29 +1,7 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - bin\Debug\Avalonia.Diagnostics.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Diagnostics.xml - CS1591 - true + Avalonia.Diagnostics @@ -38,16 +16,7 @@ - - - Properties\SharedAssemblyInfo.cs - - - %(Filename) - - - Designer - - + + \ No newline at end of file diff --git a/src/Avalonia.Diagnostics/Properties/AssemblyInfo.cs b/src/Avalonia.Diagnostics/Properties/AssemblyInfo.cs deleted file mode 100644 index f4100ef48b..0000000000 --- a/src/Avalonia.Diagnostics/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Diagnostics")] diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index a7586ac7ac..3df25cca49 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -7,11 +7,6 @@ bin\$(Configuration)\Avalonia.DotNetCoreRuntime.xml - - - Properties\SharedAssemblyInfo.cs - - @@ -21,6 +16,7 @@ + \ No newline at end of file diff --git a/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs b/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs deleted file mode 100644 index 51ec3975c9..0000000000 --- a/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.DotNetCoreRuntime")] diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index dc4a06d2a7..1c30fe1795 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -7,15 +7,13 @@ true - - Properties\SharedAssemblyInfo.cs - + - + \ No newline at end of file diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index fde486fa12..a5d9bae468 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -6,124 +6,10 @@ false CS0436 - - true - full - false - bin\Debug\ - TRACE;DEBUG;PCL - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;PCL - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -134,5 +20,6 @@ + \ No newline at end of file diff --git a/src/Avalonia.Input/Properties/AssemblyInfo.cs b/src/Avalonia.Input/AssemblyInfo.cs similarity index 87% rename from src/Avalonia.Input/Properties/AssemblyInfo.cs rename to src/Avalonia.Input/AssemblyInfo.cs index 64b8e8f1a3..7025965f83 100644 --- a/src/Avalonia.Input/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Input/AssemblyInfo.cs @@ -4,5 +4,4 @@ using System.Reflection; using Avalonia.Metadata; -[assembly: AssemblyTitle("Avalonia.Input")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Input")] diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index c82601ac2c..59e413670e 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -1,29 +1,7 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Input.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Input.xml - CS1591 - true + Avalonia.Input @@ -32,10 +10,6 @@ - - - Properties\SharedAssemblyInfo.cs - - + \ No newline at end of file diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 4f6f9ad6fe..6178ad954e 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -1,29 +1,7 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Interactivity.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Interactivity.xml - CS1591 - true + Avalonia.Interactive @@ -31,10 +9,8 @@ - - - Properties\SharedAssemblyInfo.cs - - + - \ No newline at end of file + + + diff --git a/src/Avalonia.Interactivity/Properties/AssemblyInfo.cs b/src/Avalonia.Interactivity/Properties/AssemblyInfo.cs deleted file mode 100644 index 27c8765239..0000000000 --- a/src/Avalonia.Interactivity/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Interactive")] diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 58c18921f5..39dc37478c 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -1,39 +1,13 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Layout.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Layout.xml - CS1591 - true + Avalonia.Layout - - - Properties\SharedAssemblyInfo.cs - - + \ No newline at end of file diff --git a/src/Avalonia.Layout/Properties/AssemblyInfo.cs b/src/Avalonia.Layout/Properties/AssemblyInfo.cs deleted file mode 100644 index 126893e189..0000000000 --- a/src/Avalonia.Layout/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Layout")] diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 4d9d141d0d..5116d196b5 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -1,34 +1,12 @@  netstandard2.0 - false + Avalonia.Serilog - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Logging.Serilog.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Logging.Serilog.xml - true - - - - + \ No newline at end of file diff --git a/src/Avalonia.Logging.Serilog/Properties/AssemblyInfo.cs b/src/Avalonia.Logging.Serilog/Properties/AssemblyInfo.cs deleted file mode 100644 index 35b2e48f70..0000000000 --- a/src/Avalonia.Logging.Serilog/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Serilog")] diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj index b7ad36f8b2..aee428c247 100644 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj +++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj @@ -1,10 +1,9 @@  netstandard2.0 - false + Avalonia.ReactiveUI - @@ -14,6 +13,7 @@ + \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs b/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs deleted file mode 100644 index c9ead6f6e6..0000000000 --- a/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.ReactiveUI")] diff --git a/src/Avalonia.Styling/Properties/AssemblyInfo.cs b/src/Avalonia.Styling/AssemblyInfo.cs similarity index 82% rename from src/Avalonia.Styling/Properties/AssemblyInfo.cs rename to src/Avalonia.Styling/AssemblyInfo.cs index 0a639139f7..9f1794c700 100644 --- a/src/Avalonia.Styling/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Styling/AssemblyInfo.cs @@ -5,7 +5,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using Avalonia.Metadata; -[assembly: AssemblyTitle("Avalonia.Styling")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")] diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index b8083b52db..d614747c7b 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -1,40 +1,14 @@  netstandard2.0 - false + Avalonia.Styling Avalonia - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Styling.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Styling.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - + \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index d8260226e9..1cc31d57c7 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -1,27 +1,6 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Themes.Default.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Themes.Default.xml - true @@ -34,16 +13,7 @@ - - - Properties\SharedAssemblyInfo.cs - - - %(Filename) - - - Designer - - + + \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs b/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs deleted file mode 100644 index 3657673618..0000000000 --- a/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Reflection; - -[assembly: AssemblyTitle("Avalonia.Themes.Default")] diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/AssemblyInfo.cs similarity index 85% rename from src/Avalonia.Visuals/Properties/AssemblyInfo.cs rename to src/Avalonia.Visuals/AssemblyInfo.cs index 900746d05a..05c3d7e62a 100644 --- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Visuals/AssemblyInfo.cs @@ -5,7 +5,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using Avalonia.Metadata; -[assembly: AssemblyTitle("Avalonia.Visuals")] [assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")] diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index fe18b0e446..0e2cde2c97 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -1,39 +1,12 @@  netstandard2.0 - false Avalonia - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Visuals.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Visuals.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk3/Properties/AssemblyInfo.cs b/src/Gtk/Avalonia.Gtk3/AssemblyInfo.cs similarity index 84% rename from src/Gtk/Avalonia.Gtk3/Properties/AssemblyInfo.cs rename to src/Gtk/Avalonia.Gtk3/AssemblyInfo.cs index 034b73f699..a27d631ee0 100644 --- a/src/Gtk/Avalonia.Gtk3/Properties/AssemblyInfo.cs +++ b/src/Gtk/Avalonia.Gtk3/AssemblyInfo.cs @@ -5,8 +5,6 @@ using Avalonia.Platform; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Avalonia.Gtk3")] - [assembly: ExportWindowingSubsystem(OperatingSystemType.WinNT, 2, "GTK3", typeof(Gtk3Platform), nameof(Gtk3Platform.Initialize))] [assembly: ExportWindowingSubsystem(OperatingSystemType.Linux, 1, "GTK3", typeof(Gtk3Platform), nameof(Gtk3Platform.Initialize))] [assembly: ExportWindowingSubsystem(OperatingSystemType.OSX, 2, "GTK3", typeof(Gtk3Platform), nameof(Gtk3Platform.Initialize))] \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index f1b990f349..7ac43e98bf 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -1,30 +1,9 @@  netstandard2.0 - false - - - true - full - false - bin\Debug\ - TRACE;DEBUG;GTK3_PINVOKE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;GTK3_PINVOKE - prompt - 4 true + $(DefineConstants);GTK3_PINVOKE - - - @@ -32,4 +11,5 @@ + \ No newline at end of file diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj index 466b47f7a0..fc34ecf9e9 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj +++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj @@ -11,4 +11,5 @@ + \ No newline at end of file diff --git a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj index c31c131ea9..e7c1154110 100644 --- a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj +++ b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj @@ -5,7 +5,6 @@ false - @@ -18,5 +17,6 @@ + \ No newline at end of file diff --git a/src/Shared/CompileXaml.props b/src/Shared/CompileXaml.props new file mode 100644 index 0000000000..219ffb2e42 --- /dev/null +++ b/src/Shared/CompileXaml.props @@ -0,0 +1,11 @@ + + + + %(Filename) + + + Designer + + + \ No newline at end of file diff --git a/src/Shared/Shared.props b/src/Shared/Shared.props new file mode 100644 index 0000000000..1602d7d617 --- /dev/null +++ b/src/Shared/Shared.props @@ -0,0 +1,11 @@ + + + Avalonia + 0.6.2 + Copyright 2016 © AvaloniaUI + https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md + https://github.com/AvaloniaUI/Avalonia/ + https://github.com/AvaloniaUI/Avalonia/ + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj index f5ed89d154..19ab0dffde 100644 --- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj +++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj @@ -5,13 +5,8 @@ Avalonia.Skia Avalonia.Skia true - true + true - - - Properties\SharedAssemblyInfo.cs - - @@ -21,6 +16,7 @@ + - + \ No newline at end of file From b1615939940fb397ac14dbfa6469dad027e399e1 Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 12:47:39 +0800 Subject: [PATCH 02/15] Moved version and xaml props to build directory. added Directory.Build.Props to src & samples directory. cleaned up Avalonia.Markup.csproj. Will do more test to do the same on Avalonia.Markup.Xaml. --- .../EmbedXaml.props | 0 .../Shared.props => build/SharedVersion.props | 0 samples/Directory.Build.props | 3 +++ samples/RenderTest/RenderTest.csproj | 3 +-- .../VirtualizationTest.csproj | 3 +-- .../Avalonia.Animation.csproj | 1 - src/Avalonia.Base/Avalonia.Base.csproj | 1 - .../Avalonia.Controls.csproj | 1 - .../Avalonia.Diagnostics.csproj | 6 ++--- .../Avalonia.DotNetCoreRuntime.csproj | 6 +---- .../Avalonia.DotNetFrameworkRuntime.csproj | 3 +-- .../Avalonia.HtmlRenderer.csproj | 2 +- src/Avalonia.Input/Avalonia.Input.csproj | 4 +-- .../Avalonia.Interactivity.csproj | 1 - src/Avalonia.Layout/Avalonia.Layout.csproj | 4 +-- .../Avalonia.Logging.Serilog.csproj | 3 +-- .../Avalonia.ReactiveUI.csproj | 2 -- src/Avalonia.Styling/Avalonia.Styling.csproj | 1 - .../Avalonia.Themes.Default.csproj | 5 ++-- src/Avalonia.Visuals/Avalonia.Visuals.csproj | 3 +-- src/Directory.Build.props | 3 +++ src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj | 1 - .../Avalonia.LinuxFramebuffer.csproj | 3 +-- .../Avalonia.Markup.Xaml.csproj | 3 --- .../{Properties => }/AssemblyInfo.cs | 1 - .../Avalonia.Markup/Avalonia.Markup.csproj | 27 ------------------- .../Avalonia.MonoMac/Avalonia.MonoMac.csproj | 1 - src/Skia/Avalonia.Skia/Avalonia.Skia.csproj | 2 +- 28 files changed, 21 insertions(+), 72 deletions(-) rename src/Shared/CompileXaml.props => build/EmbedXaml.props (100%) rename src/Shared/Shared.props => build/SharedVersion.props (100%) create mode 100644 samples/Directory.Build.props create mode 100644 src/Directory.Build.props rename src/Markup/Avalonia.Markup/{Properties => }/AssemblyInfo.cs (89%) diff --git a/src/Shared/CompileXaml.props b/build/EmbedXaml.props similarity index 100% rename from src/Shared/CompileXaml.props rename to build/EmbedXaml.props diff --git a/src/Shared/Shared.props b/build/SharedVersion.props similarity index 100% rename from src/Shared/Shared.props rename to build/SharedVersion.props diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props new file mode 100644 index 0000000000..7325bab2a3 --- /dev/null +++ b/samples/Directory.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index 4373e4715a..1fa9a140fe 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -22,8 +22,7 @@ - - + diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 180c8dd48d..b29ea52b28 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -22,8 +22,7 @@ - - + diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 6627fdf952..46e41dd32a 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -5,6 +5,5 @@ - \ No newline at end of file diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 599374f75a..35adcbeb92 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -4,7 +4,6 @@ Avalonia.Base Avalonia - diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index e50625a4c4..a29c807bcc 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -13,7 +13,6 @@ - \ No newline at end of file diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 59ed1685f4..a2ff0ecf02 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -1,7 +1,6 @@  netstandard2.0 - Avalonia.Diagnostics @@ -15,8 +14,7 @@ - - - + + \ No newline at end of file diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index 3df25cca49..5f40d347b7 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -4,9 +4,6 @@ false $(DefineConstants);DOTNETCORE - - bin\$(Configuration)\Avalonia.DotNetCoreRuntime.xml - @@ -15,8 +12,7 @@ - - + \ No newline at end of file diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index 1c30fe1795..eca5b89419 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -11,8 +11,7 @@ - - + diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index a5d9bae468..520687c3ef 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -20,6 +20,6 @@ - + \ No newline at end of file diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 59e413670e..86d081abb8 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -1,7 +1,6 @@  netstandard2.0 - Avalonia.Input @@ -9,7 +8,6 @@ - - + \ No newline at end of file diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 6178ad954e..1f8247b387 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -9,7 +9,6 @@ - diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 39dc37478c..befa22ec46 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -1,13 +1,11 @@  netstandard2.0 - Avalonia.Layout - - + \ No newline at end of file diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 5116d196b5..4c67ffd7b9 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -6,7 +6,6 @@ - - + \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj index aee428c247..ae1ef60464 100644 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj +++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj @@ -1,7 +1,6 @@  netstandard2.0 - Avalonia.ReactiveUI @@ -13,7 +12,6 @@ - \ No newline at end of file diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index d614747c7b..3c9dce8dca 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -9,6 +9,5 @@ - \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 1cc31d57c7..eceafc2371 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -12,8 +12,7 @@ - - - + + \ No newline at end of file diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 0e2cde2c97..f320644cd0 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -6,7 +6,6 @@ - - + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000000..7325bab2a3 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index 7ac43e98bf..ef043959ad 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -11,5 +11,4 @@ - \ No newline at end of file diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj index fc34ecf9e9..fb1fbdaf93 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj +++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj @@ -10,6 +10,5 @@ - - + \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index bd6acfdad1..95208fabd9 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -26,9 +26,6 @@ CS1591 - - Properties\SharedAssemblyInfo.cs - diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/AssemblyInfo.cs similarity index 89% rename from src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs rename to src/Markup/Avalonia.Markup/AssemblyInfo.cs index dd8c0a6bd3..15c0be673a 100644 --- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs +++ b/src/Markup/Avalonia.Markup/AssemblyInfo.cs @@ -5,6 +5,5 @@ using System.Reflection; using Avalonia.Metadata; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("Avalonia.Markup")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup")] [assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")] diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index a6d3c3336f..9707662701 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -3,33 +3,6 @@ netstandard2.0 false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Avalonia.Markup.xml - CS1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Avalonia.Markup.xml - CS1591 - true - - - - Properties\SharedAssemblyInfo.cs - - diff --git a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj index e7c1154110..cbf91e818a 100644 --- a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj +++ b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj @@ -17,6 +17,5 @@ - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj index 19ab0dffde..ade7f8778a 100644 --- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj +++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj @@ -16,7 +16,7 @@ - + \ No newline at end of file From 9aa93ee6d9bf0a5c6db18241aa3da9fc8797be6c Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 13:23:11 +0800 Subject: [PATCH 03/15] Fix merge conflict --- src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index fd49f51598..49f6ca9eeb 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -26,10 +26,6 @@ CS1591 - - - Properties\SharedAssemblyInfo.cs - From 3873efea02dab3605830e40e1772fb19828062b0 Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 13:34:48 +0800 Subject: [PATCH 04/15] Added GenerateDocumentationFile attribute to fix Cake --- build/SharedVersion.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/SharedVersion.props b/build/SharedVersion.props index 1602d7d617..86ee811125 100644 --- a/build/SharedVersion.props +++ b/build/SharedVersion.props @@ -7,5 +7,7 @@ https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md https://github.com/AvaloniaUI/Avalonia/ https://github.com/AvaloniaUI/Avalonia/ + true + CS1591 \ No newline at end of file From 73f408de2190b7d24603bc08aa2da8eb89122e6d Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 13:54:58 +0800 Subject: [PATCH 05/15] Fix Avalonia.Interactive to Avalonia.Interactivity --- src/Avalonia.Interactivity/Avalonia.Interactivity.csproj | 1 - .../Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 1f8247b387..66f1e8cc26 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -1,7 +1,6 @@  netstandard2.0 - Avalonia.Interactive diff --git a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs index 49d227c3e9..318b40828e 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Reflection; using Xunit; -[assembly: AssemblyTitle("Avalonia.Interactive.UnitTests")] +[assembly: AssemblyTitle("Avalonia.Interactivity.UnitTests")] // Don't run tests in parallel. [assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file From f8dc172416f7a29c8a478e5ad254aa86abf170ab Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 14:09:47 +0800 Subject: [PATCH 06/15] Fix Avalonia.Serilog to Avalonia.Logging.Serilog --- src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 4c67ffd7b9..456cd8c568 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -1,7 +1,6 @@  netstandard2.0 - Avalonia.Serilog From dd3a9ed3d344dd1472602f91bd1109d9fa7a6f4d Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sun, 6 May 2018 14:45:44 +0800 Subject: [PATCH 07/15] Port BindingTest sample to the new csproj format. Also added MainWindow's Title. Added net461 on TargetFramework attribs on the samples. --- samples/BindingTest/BindingTest.csproj | 169 +++--------------- samples/BindingTest/MainWindow.xaml | 3 +- .../BindingTest/Properties/AssemblyInfo.cs | 36 ---- samples/RenderTest/MainWindow.xaml | 2 +- samples/RenderTest/RenderTest.csproj | 2 +- samples/VirtualizationTest/MainWindow.xaml | 2 +- .../VirtualizationTest.csproj | 4 +- 7 files changed, 28 insertions(+), 190 deletions(-) delete mode 100644 samples/BindingTest/Properties/AssemblyInfo.cs diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index a17fe0eed1..c89921e427 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -1,155 +1,28 @@ - - - + - Debug - AnyCPU - {08B3E6B9-1CD5-443C-9F61-6D49D1C5F162} - WinExe - Properties - BindingTest - BindingTest - v4.7 - 512 - true - - PackageReference + Exe + netcoreapp2.0;net461 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - Designer - - - App.xaml - - - MainWindow.xaml - - - - TestItemView.xaml - - - - - - - - - - - - Designer - - - - - {4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0} - Avalonia.DotNetFrameworkRuntime - - - {3e53a01a-b331-47f3-b828-4a5717e77a24} - Avalonia.Markup.Xaml - - - {6417e941-21bc-467b-a771-0de389353ce6} - Avalonia.Markup - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Avalonia.DesignerSupport - - - {7062ae20-5dcc-4442-9645-8195bdece63e} - Avalonia.Diagnostics - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {b61b66a3-b82d-4875-8001-89d3394fe0c9} - Avalonia.Logging.Serilog - - - {6417b24e-49c2-4985-8db2-3ab9d898ec91} - Avalonia.ReactiveUI - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f} - Avalonia.Themes.Default - - - {3e908f67-5543-4879-a1dc-08eace79b3cd} - Avalonia.Direct2D1 - - - {811a76cf-1cf6-440f-963b-bbe31bd72a82} - Avalonia.Win32 - + + + + + + + + + + + + + + + + + - + diff --git a/samples/BindingTest/MainWindow.xaml b/samples/BindingTest/MainWindow.xaml index 4eb45e07c5..ad488c35a8 100644 --- a/samples/BindingTest/MainWindow.xaml +++ b/samples/BindingTest/MainWindow.xaml @@ -1,7 +1,8 @@ + xmlns:local="clr-namespace:BindingTest" + Title="AvaloniaUI Bindings Test">